Merge branch 'master' of ssh://git.planet-lab.org/git/sfa

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index 92f7db8..06f184c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,36 +5,24 @@
 DESTDIR="/"
 
 ##########
-all: keyconvert python wsdl
+all: python wsdl
 
-install: keyconvert-install python-install wsdl-install xmlbuilder-install
+install: python-install wsdl-install xmlbuilder-install 
 
-clean: keyconvert-clean python-clean wsdl-clean
+clean: python-clean wsdl-clean
 
-.PHONY: all install clean 
-
-##########
-keyconvert:
-       $(MAKE) -C keyconvert
-
-keyconvert-install:
-       $(MAKE) -C keyconvert install
+uninstall: python-uninstall
 
-keyconvert-clean:
-       $(MAKE) -C keyconvert clean
-
-.PHONY: keyconvert keyconvert-install keyconvert-clean 
+.PHONY: all install clean 
 
 ##########
 python: 
 
 xmlbuilder-install:
-       cd xmlbuilder-0.9
-       python setup.py install 
-       cd -
-
+       cd xmlbuilder-0.9 && python setup.py install --root=$(DESTDIR) && cd -
+ 
 python-install:
-       python setup.py install --root=$(DESTDIR)
+       python setup.py install --root=$(DESTDIR)       
        chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
 
 python-clean:
@@ -58,7 +46,7 @@ wsdl-clean:
 
 # are the .java files used ?
 tags:  
-       find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
+       find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
 .PHONY: tags
 
 
@@ -69,6 +57,8 @@ tags:
 # (*) otherwise, entering through the root context
 # make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
 
+PLCHOST ?= testplc.onelab.eu
+
 ifdef GUEST
 ifdef PLCHOST
 SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
@@ -81,9 +71,9 @@ SSHCOMMAND:=ssh root@$(PLC)
 endif
 
 LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 
-RSYNC_EXCLUDES         := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_EXCLUDES         := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
-RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
+RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 
 BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
        ./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py ./sfa/server/sfa-server.py \