X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=26251f03c5e1782de0c6b71b52571eee070711a4;hb=8dd8554312526095295e6968b2ad17d67c5a8e4a;hp=7bfdf238b9b08537039118b5d677cba9e2f25d99;hpb=c66834d591e3598be7f4f3236da9b527a5a8c1fb;p=sfa.git

diff --git a/Makefile b/Makefile
index 7bfdf238..26251f03 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ keyconvert-clean:
 
 ##########
 python: 
-	echo 'nothing to do for python - no __init__ generated anymore'
 
 python-install:
 	python setup.py install --root=$(DESTDIR)
@@ -41,52 +40,10 @@ python-clean:
 
 # are the .java files used ?
 tags:	
-	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$' | xargs etags
+	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
 .PHONY: tags
 
 
-########## indexes
-init := geni/__init__.py geni/util/__init__.py geni/methods/__init__.py 
-
-force:
-.PHONY: force 
-
-index: $(init)
-.PHONY: index
-
-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()') > $@
-
-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
-
 ########## sync
 # 2 forms are supported
 # (*) if your plc root context has direct ssh access:
@@ -117,9 +74,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) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/
 	+$(RSYNC) ./config/sfa-config-tty $(SSHURL)/usr/bin
-	$(SSHCOMMAND) exec service geni restart
+	$(SSHCOMMAND) exec service sfa restart
 endif
 
 .PHONY: sync