no more __init__ created for now

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index 39b9fd7..b56aa92 100644 (file)
--- 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,7 +26,8 @@ keyconvert-clean:
 .PHONY: keyconvert keyconvert-install keyconvert-clean 
 
 ##########
-python: $(init)
+python: 
+       echo 'nothing to do for python - no __init__ generated anymore'
 
 python-install:
        python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES
@@ -40,7 +41,7 @@ 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/|\.py[co]$$|TAGS' | xargs etags
 .PHONY: tags
 
 
@@ -50,6 +51,9 @@ 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()') > $@
 
@@ -114,7 +118,8 @@ ifeq (,$(SSHURL))
        @exit 1
 else
        +$(RSYNC) ./geni/ $(SSHURL)/usr/lib/python2.5/site-packages/geni/
-       +$(RSYNC) geni-config-tty $(SSHURL)/usr/bin
+       +$(RSYNC) ./config/sfa-config-tty $(SSHURL)/usr/bin
+       $(SSHCOMMAND) exec service geni restart
 endif
 
 .PHONY: sync