X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=a1bd00a1c538713b7df59bdafbb5e9ef53b357bd;hb=refs%2Fheads%2Fgeni;hp=0b35612642c1a6e1ac2b3d681af1b9527c306d16;hpb=08ab670513d36fe052b1c6ca95833abe806bec9d;p=sfa.git

diff --git a/Makefile b/Makefile
index 0b356126..a1bd00a1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,42 +5,48 @@
 DESTDIR="/"
 
 ##########
-all: keyconvert python
+all: python wsdl
 
-install: keyconvert-install python-install
+install: python-install wsdl-install xmlbuilder-install 
 
-clean: keyconvert-clean python-clean
+clean: python-clean wsdl-clean
 
-.PHONY: all install clean 
-
-##########
-keyconvert:
-	$(MAKE) -C keyconvert
+uninstall: python-uninstall
 
-keyconvert-install:
-	$(MAKE) -C keyconvert install
-
-keyconvert-clean:
-	$(MAKE) -C keyconvert clean
-
-.PHONY: keyconvert keyconvert-install keyconvert-clean 
+.PHONY: all install clean 
 
 ##########
 python: 
 
+xmlbuilder-install:
+	cd xmlbuilder-0.9 && python setup.py install --root=$(DESTDIR) && cd -
+ 
 python-install:
-	python setup.py install --root=$(DESTDIR)
+	python setup.py install --root=$(DESTDIR)	
+	chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
 
 python-clean:
 	python setup.py clean
 	rm $(init)
 
-.PHONY: python python-install python-clean
+.PHONY: python python-install python-clean xmlbuilder-install
+##########
+wsdl: 
+	$(MAKE) -C wsdl 
+
+# propagate DESTDIR from the specfile
+wsdl-install:
+	$(MAKE) -C wsdl install 
+
+wsdl-clean:
+	$(MAKE) -C wsdl clean
+
+.PHONY: wsdl wsdl-install wsdl-clean
 ##########
 
 # are the .java files used ?
 tags:	
-	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$' | xargs etags
+	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
 .PHONY: tags
 
 
@@ -67,6 +73,11 @@ RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
+BINS =	./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
+	./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py ./sfa/server/sfa-server.py \
+	./sfa/client/sfi.py ./sfa/client/getNodes.py ./sfa/client/getRecord.py \
+	./sfa/client/setRecord.py ./sfa/client/sfadump.py
+
 sync:
 ifeq (,$(SSHURL))
 	@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
@@ -75,7 +86,7 @@ ifeq (,$(SSHURL))
 	@exit 1
 else
 	+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/
-	+$(RSYNC) ./config/sfa-config-tty $(SSHURL)/usr/bin
+	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin
 	$(SSHCOMMAND) exec service sfa restart
 endif