X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=a6965bbef4df310f2bdc2a2b0a5e0b21412cc226;hb=73b163a7ea35209e0675a7c7cef367946928a96f;hp=5fddce6f7c5e6ebeec66503b52c8aa540226287f;hpb=06ae08c6669e2b380e81ea99398981eabbae2277;p=sfa.git

diff --git a/Makefile b/Makefile
index 5fddce6f..a6965bbe 100644
--- a/Makefile
+++ b/Makefile
@@ -4,73 +4,57 @@
 # overwritten by the specfile
 DESTDIR="/"
 
-init := geni/__init__.py geni/util/__init__.py geni/methods/__init__.py 
-subdirs := keyconvert #pyOpenSSL-0.9
+##########
+all: keyconvert python wsdl
 
-all: install
+install: keyconvert-install python-install wsdl-install
 
-install: $(init) $(subdirs) install-python
+clean: keyconvert-clean python-clean wsdl-clean
 
-install-python:
-	python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES
+.PHONY: all install clean 
 
-$(subdirs): $(init)
+##########
+keyconvert:
+	$(MAKE) -C keyconvert
 
-$(subdirs): %:
-	$(MAKE) -C $@
+keyconvert-install:
+	$(MAKE) -C keyconvert install
 
-clean:
-	python setup.py clean
-	for i in $(subdirs); do make -C $$i clean ; done
-
-index: $(init)
-
-index-clean:
-	rm $(init)
+keyconvert-clean:
+	$(MAKE) -C keyconvert clean
 
-.phony: all install install-python force clean index $(subdirs)
+.PHONY: keyconvert keyconvert-install keyconvert-clean 
 
-force:
-
-# are the .java files used ?
-tags:	
-	find . -name '*.py' -o -name '*.sh' -o -name '*.ecore'  | grep -v '/\.svn/' | xargs etags
+##########
+python: 
 
+python-install:
+	python setup.py install --root=$(DESTDIR)
 
+python-clean:
+	python setup.py clean
+	rm $(init)
 
-########## indexes
-geni/__init__.py:
-	(echo '## Please use make index to update this file' ; echo 'all = """' ; cd geni; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
+.PHONY: python python-install python-clean
+##########
+wsdl: 
+	$(MAKE) -C wsdl 
 
-geni/methods/__init__.py:
-	(echo '## Please use make index to update this file' ; echo 'all = """' ; cd geni/methods; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
+# propagate DESTDIR from the specfile
+wsdl-install:
+	$(MAKE) -C wsdl install 
 
-geni/util/__init__.py:
-	(echo '## Please use make index to update this file' ; echo 'all = """' ; cd geni/util; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
+wsdl-clean:
+	$(MAKE) -C wsdl clean
 
-geni_now := $(sort $(shell fgrep -v '"' geni/__init__.py 2>/dev/null))
-# what should be declared
-geni_paths := $(filter-out %/__init__.py, $(wildcard geni/*.py))
-geni_files := $(sort $(notdir $(geni_paths:.py=)))
-ifneq ($(geni_now), $(geni_files))
-geni/__init__.py: force
-endif
+.PHONY: wsdl wsdl-install wsdl-clean
+##########
 
-methods_now := $(sort $(shell fgrep -v '"' geni/methods/__init__.py 2>/dev/null))
-# what should be declared
-method_paths := $(filter-out %/__init__.py, $(wildcard geni/methods/*.py))
-method_files := $(sort $(notdir $(method_paths:.py=)))
-ifneq ($(methods_now), $(methods_files))
-geni/methods/__init__.py: force
-endif
+# are the .java files used ?
+tags:	
+	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
+.PHONY: tags
 
-util_now := $(sort $(shell fgrep -v '"' geni/util/__init__.py 2>/dev/null))
-# what should be declared
-util_paths := $(filter-out %/__init__.py, $(wildcard geni/util/*.py))
-util_files := $(sort $(notdir $(util_paths:.py=)))
-ifneq ($(util_now), $(util_files))
-geni/util/__init__.py: force
-endif
 
 ########## sync
 # 2 forms are supported
@@ -95,6 +79,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 ./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
+
 sync:
 ifeq (,$(SSHURL))
 	@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
@@ -102,7 +91,10 @@ 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) geni-config-tty $(SSHURL)/usr/bin
+	+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/
+	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin
+	$(SSHCOMMAND) exec service sfa restart
 endif
 
+.PHONY: sync
+##########