X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=3d3fc9a017b086c5f5153a67553d72d49885cec1;hb=refs%2Fheads%2Fbranch-0.9-14;hp=547fcf7afc177deac1ef6419d93105a04b052a74;hpb=9041cc89f2bf0569c347027eddfdf3ced53c6bca;p=sfa.git

diff --git a/Makefile b/Makefile
index 547fcf7a..3d3fc9a0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,9 @@
 DESTDIR="/"
 
 ##########
-#all: keyconvert python wsdl
-# turn off wsdl generation until it is fixed
-all: keyconvert python
+all: keyconvert python wsdl
 
-install: keyconvert-install python-install wsdl-install
+install: keyconvert-install python-install wsdl-install xmlbuilder-install
 
 clean: keyconvert-clean python-clean wsdl-clean
 
@@ -30,14 +28,18 @@ keyconvert-clean:
 ##########
 python: 
 
+xmlbuilder-install:
+	cd xmlbuilder-0.9 && python setup.py install --root=$(DESTDIR) && cd -
+
 python-install:
 	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 
@@ -81,10 +83,10 @@ 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 ./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py \
-	./sfa/server/sfa-server.py \
+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/genidump.py
+	./sfa/client/setRecord.py ./sfa/client/sfadump.py
 
 sync:
 ifeq (,$(SSHURL))