small updates to generated login base and site name for geni users

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index 57c74ce..a1bd00a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,57 +5,50 @@
 DESTDIR="/"
 
 ##########
-all: keyconvert python
+all: python wsdl
 
-install: keyconvert-install python-install
+install: python-install wsdl-install xmlbuilder-install 
 
-clean: keyconvert-clean python-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: index
+python: 
 
+xmlbuilder-install:
+       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:
        python setup.py clean
        rm $(init)
 
-.PHONY: python python-install python-clean
+.PHONY: python python-install python-clean xmlbuilder-install
 ##########
+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 
 
-########## indexes
-subdirs = client methods plc server trust util
-init := sfa/__init__.py $(foreach subdir, $(subdirs), sfa/$(subdir)/__init__.py)
+wsdl-clean:
+       $(MAKE) -C wsdl clean
 
-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 +73,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 ./config/gen-sfa-cm-config.py \
+       ./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/sfadump.py
+
 sync:
 ifeq (,$(SSHURL))
        @echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
@@ -88,7 +86,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