X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=57c74ce5dbbde8927ae9737cc37ee07dbd3d2acc;hb=f13173726f8382eef380f1e754f24dd2b126a77b;hp=39b9fd793f33d0ca4ba3e21627ebc19670c14e5c;hpb=bc09bf4498ebf7c386504b41f757001c67da4b19;p=sfa.git

diff --git a/Makefile b/Makefile
index 39b9fd79..57c74ce5 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ all: keyconvert python
 
 install: keyconvert-install python-install
 
-clean: keyconvert-clean key-convert-python
+clean: keyconvert-clean python-clean
 
 .PHONY: all install clean 
 
@@ -26,10 +26,10 @@ keyconvert-clean:
 .PHONY: keyconvert keyconvert-install keyconvert-clean 
 
 ##########
-python: $(init)
+python: index
 
 python-install:
-	python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES
+	python setup.py install --root=$(DESTDIR)
 
 python-clean:
 	python setup.py clean
@@ -40,48 +40,22 @@ python-clean:
 
 # are the .java files used ?
 tags:	
-	find . -name '*.py' -o -name '*.sh' -o -name '*.ecore'  | grep -v '/\.svn/' | xargs etags
+	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$' | xargs etags
 .PHONY: tags
 
 
 ########## indexes
-init := geni/__init__.py geni/util/__init__.py geni/methods/__init__.py 
+subdirs = client methods plc server trust util
+init := sfa/__init__.py $(foreach subdir, $(subdirs), sfa/$(subdir)/__init__.py)
 
 force:
 .PHONY: force 
 
-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()') > $@
+index: $(init)
+.PHONY: index
 
-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()') > $@
-
-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()') > $@
-
-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
-
-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
-
-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
+$(init):
+	touch $@
 
 ########## sync
 # 2 forms are supported
@@ -113,8 +87,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) geni-config-tty $(SSHURL)/usr/bin
+	+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/
+	+$(RSYNC) ./config/sfa-config-tty $(SSHURL)/usr/bin
+	$(SSHCOMMAND) exec service sfa restart
 endif
 
 .PHONY: sync