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

diff --git a/Makefile b/Makefile
index 5fddce6f..26251f03 100644
--- a/Makefile
+++ b/Makefile
@@ -4,73 +4,45 @@
 # 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
 
-all: install
+install: keyconvert-install python-install
 
-install: $(init) $(subdirs) install-python
+clean: keyconvert-clean python-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
+keyconvert-clean:
+	$(MAKE) -C keyconvert clean
 
-index: $(init)
+.PHONY: keyconvert keyconvert-install keyconvert-clean 
 
-index-clean:
-	rm $(init)
+##########
+python: 
 
-.phony: all install install-python force clean index $(subdirs)
+python-install:
+	python setup.py install --root=$(DESTDIR)
+
+python-clean:
+	python setup.py clean
+	rm $(init)
 
-force:
+.PHONY: python python-install python-clean
+##########
 
 # are the .java files used ?
 tags:	
-	find . -name '*.py' -o -name '*.sh' -o -name '*.ecore'  | grep -v '/\.svn/' | xargs etags
-
-
-
-########## 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()') > $@
+	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
+.PHONY: tags
 
-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
@@ -102,7 +74,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) ./config/sfa-config-tty $(SSHURL)/usr/bin
+	$(SSHCOMMAND) exec service sfa restart
 endif
 
+.PHONY: sync
+##########