X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=793217260c0c1fccd015aaa01d952d7800bc9ef9;hb=76c695ad853d9e6bf3d2d272f640661ec1e1397d;hp=db8c4805e7ff27c2ce487774f109a9ca3dd53e9b;hpb=f46bbb54f27b9af1f850c7383ac21976f723ace0;p=sfa.git

diff --git a/Makefile b/Makefile
index db8c4805..79321726 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,13 @@
 DESTDIR="/"
 
 ##########
-all: keyconvert python
+all: keyconvert python wsdl
 
-install: keyconvert-install python-install
+install: keyconvert-install python-install wsdl-install xmlbuilder-install 
 
-clean: keyconvert-clean python-clean
+clean: keyconvert-clean python-clean wsdl-clean
+
+uninstall: python-uninstall
 
 .PHONY: all install clean 
 
@@ -26,36 +28,39 @@ keyconvert-clean:
 .PHONY: keyconvert keyconvert-install keyconvert-clean 
 
 ##########
-python: index
+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 
 
-# are the .java files used ?
-tags:	
-	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$' | xargs etags
-.PHONY: tags
-
+# propagate DESTDIR from the specfile
+wsdl-install:
+	$(MAKE) -C wsdl install 
 
-########## indexes
-subdirs = client methods plc server trust util
-init := geni/__init__.py $(foreach subdir, $(subdirs), geni/$(subdir)/__init__.py)
+wsdl-clean:
+	$(MAKE) -C wsdl clean
 
-force:
-.PHONY: force 
+.PHONY: wsdl wsdl-install wsdl-clean
+##########
 
-index: $(init)
-.PHONY: index
+# are the .java files used ?
+tags:	
+	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
+.PHONY: tags
 
-$(init):
-	touch $@
 
 ########## sync
 # 2 forms are supported
@@ -80,6 +85,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"
@@ -87,9 +97,9 @@ ifeq (,$(SSHURL))
 	@echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
 	@exit 1
 else
-	+$(RSYNC) ./geni/ $(SSHURL)/usr/lib/python2.5/site-packages/geni/
-	+$(RSYNC) ./config/sfa-config-tty $(SSHURL)/usr/bin
-	$(SSHCOMMAND) exec service geni restart
+	+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/
+	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin
+	$(SSHCOMMAND) exec service sfa restart
 endif
 
 .PHONY: sync