bunch of cleanups & fixes all over the place

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index 57c74ce..a6965bb 100644 (file)
--- 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 
 
@@ -26,7 +26,7 @@ keyconvert-clean:
 .PHONY: keyconvert keyconvert-install keyconvert-clean 
 
 ##########
-python: index
+python: 
 
 python-install:
        python setup.py install --root=$(DESTDIR)
@@ -37,25 +37,24 @@ python-clean:
 
 .PHONY: python python-install python-clean
 ##########
+wsdl: 
+       $(MAKE) -C wsdl 
 
-# are the .java files used ?
-tags:  
-       find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$' | xargs etags
-.PHONY: tags
+# propagate DESTDIR from the specfile
+wsdl-install:
+       $(MAKE) -C wsdl install 
 
+wsdl-clean:
+       $(MAKE) -C wsdl clean
 
-########## indexes
-subdirs = client methods plc server trust util
-init := sfa/__init__.py $(foreach subdir, $(subdirs), sfa/$(subdir)/__init__.py)
-
-force:
-.PHONY: force 
+.PHONY: wsdl wsdl-install wsdl-clean
+##########
 
-index: $(init)
-.PHONY: index
+# are the .java files used ?
+tags:  
+       find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
+.PHONY: tags
 
-$(init):
-       touch $@
 
 ########## sync
 # 2 forms are supported
@@ -80,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"
@@ -88,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