X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=fbd2a0e98d8d27df505776681f2cb280d87bccd8;hb=8f5b1806018a63c676bab171d1171bcd18ea7884;hp=68c42b90a19bb1d57a623e3fe6759cf0a6d84e57;hpb=d5914fa3ef20eb82da53242454e019fe419f597b;p=sfa.git

diff --git a/Makefile b/Makefile
index 68c42b90..fbd2a0e9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,40 +5,31 @@
 DESTDIR="/"
 
 ##########
-# turn off wsdl generation until it is fixed
-#all: keyconvert python wsdl
-#install: keyconvert-install python-install wsdl-install
+all: python wsdl
 
-all: keyconvert python
-install: keyconvert-install python-install 
+install: python-install wsdl-install xmlbuilder-install 
 
-clean: keyconvert-clean python-clean wsdl-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 
@@ -55,7 +46,7 @@ wsdl-clean:
 
 # are the .java files used ?
 tags:	
-	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
+	find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
 .PHONY: tags
 
 
@@ -78,14 +69,14 @@ SSHCOMMAND:=ssh root@$(PLC)
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
-RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_EXCLUDES		:= --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
-RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
+RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(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))