extract/separate binary clients in sfa/clientbin

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index 701c329..93c808b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,9 +89,13 @@ sfa/methods/__init__.py:
 force:
 
 ##########
+# a lot of stuff in the working dir is just noise
+scan:
+       @find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|xml|dg)$$' 
 tags:  
-       find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|~$$|\.(py[co]|doc|html|pdf|png|svg|out|bak|xml|dg)$$' | xargs etags
-.PHONY: tags
+       $(MAKE) scan | xargs etags
+
+.PHONY: scan tags
 
 signatures:
        (cd sfa/methods; grep 'def.*call' *.py > SIGNATURES)
@@ -123,13 +127,11 @@ RSYNC_EXCLUDES            := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $
 RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 
-CLIENTS = sfi.py getNodes.py getRecord.py setRecord.py \
-sfiAddAttribute.py sfiAddSliver.py sfiDeleteAttribute.py sfiDeleteSliver.py sfiListNodes.py \
-sfiListSlivers.py sfadump.py
+CLIENTS = $(shell ls sfa/clientbin/*.py)
 
 BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
        ./sfa/importer/sfa-import-plc.py ./sfa/importer/sfa-nuke-plc.py ./sfa/server/sfa-start.py \
-       $(foreach client,$(CLIENTS),./sfa/client/$(client))
+       $(CLIENTS)
 
 sync:
 ifeq (,$(SSHURL))
@@ -141,8 +143,9 @@ else
        +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
        +$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
        +$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
-       +$(RSYNC) ./sfa/init.d/sfa  $(SSHURL)/etc/init.d/
+       +$(RSYNC) ./init.d/sfa  $(SSHURL)/etc/init.d/
        +$(RSYNC) ./config/default_config.xml $(SSHURL)/etc/sfa/
+       +$(RSYNC) ./sfa/storage/sfa.sql $(SSHURL)/usr/share/sfa/
        $(SSHCOMMAND) exec service sfa restart
 endif
 
@@ -151,5 +154,9 @@ fastsync:
        +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
        $(SSHCOMMAND) exec service sfa restart
 
-.PHONY: sync
+clientsync:
+       +$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
+
+.PHONY: sync fastsync clientsync
+
 ##########