X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=ea0ad1a178acca972c8c43468ad49bdf577b7af8;hb=d222171f8b212c9804840d06c051c12a04e4eac2;hp=2573dc8e75e761d62b3f7c4b42da2c9f3c7d1751;hpb=664b3fab713316f309aec41f7ff8a3f034b9e3ea;p=sfa.git

diff --git a/Makefile b/Makefile
index 2573dc8e..ea0ad1a1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,15 @@
 #
 # 
 # Meta
+DESTDIR="/"
 init := geni/__init__.py geni/util/__init__.py geni/methods/__init__.py 
 
-subdirs := keyconvert #pyOpenSSL-0.7
- 
-all: install $(init) $(subdirs)
+subdirs := keyconvert #pyOpenSSL-0.9
 
-install: 
-	python setup.py install
+all: $(init) $(subdirs)
+
+install: all
+	python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES
 
 $(subdirs): $(init)
 
@@ -18,9 +19,8 @@ $(subdirs): %:
 	$(MAKE) -C $@
 
 clean:
-	python setup.py uninstall
-	# XX remove keyconvert   
-	
+	python setup.py clean
+	cd keyconvert && make clean
 
 index: $(init)
 
@@ -65,3 +65,7 @@ endif
 force:
 
 .PHONY: all install force clean index tags $(subdirs)
+
+# are the .java files used ?
+tags:	
+	find . -name '*.py' -o -name '*.sh' -o -name '*.ecore'  | grep -v '/\.svn/' | xargs etags