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

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index 7932172..31506ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,28 +5,16 @@
 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
 
 uninstall: python-uninstall
 
 .PHONY: all install clean 
 
-##########
-keyconvert:
-       $(MAKE) -C keyconvert
-
-keyconvert-install:
-       $(MAKE) -C keyconvert install
-
-keyconvert-clean:
-       $(MAKE) -C keyconvert clean
-
-.PHONY: keyconvert keyconvert-install keyconvert-clean 
-
 ##########
 python: 
 
@@ -83,7 +71,7 @@ endif
 LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 
 RSYNC_EXCLUDES         := --exclude .svn --exclude CVS --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 \