X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=a6965bbef4df310f2bdc2a2b0a5e0b21412cc226;hb=30c870a0f92d2daed62e860c6d8f0ada4ba0427a;hp=26251f03c5e1782de0c6b71b52571eee070711a4;hpb=7e7237bcba3737207996095332f46ca4fb4c0b37;p=sfa.git diff --git a/Makefile b/Makefile index 26251f03..a6965bbe 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,11 @@ DESTDIR="/" ########## -all: keyconvert python +all: keyconvert python wsdl -install: keyconvert-install python-install +install: keyconvert-install python-install wsdl-install -clean: keyconvert-clean python-clean +clean: keyconvert-clean python-clean wsdl-clean .PHONY: all install clean @@ -37,6 +37,18 @@ python-clean: .PHONY: python python-install python-clean ########## +wsdl: + $(MAKE) -C wsdl + +# propagate DESTDIR from the specfile +wsdl-install: + $(MAKE) -C wsdl install + +wsdl-clean: + $(MAKE) -C wsdl clean + +.PHONY: wsdl wsdl-install wsdl-clean +########## # are the .java files used ? tags: @@ -67,6 +79,11 @@ RSYNC_EXCLUDES := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $( RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,) RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES) +BINS = ./config/sfa-config-tty ./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py \ + ./sfa/server/sfa-server.py \ + ./sfa/client/sfi.py ./sfa/client/getNodes.py ./sfa/client/getRecord.py \ + ./sfa/client/setRecord.py ./sfa/client/genidump.py + sync: ifeq (,$(SSHURL)) @echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line" @@ -75,7 +92,7 @@ ifeq (,$(SSHURL)) @exit 1 else +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/ - +$(RSYNC) ./config/sfa-config-tty $(SSHURL)/usr/bin + +$(RSYNC) $(BINS) $(SSHURL)/usr/bin $(SSHCOMMAND) exec service sfa restart endif