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

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index 1ad12d2..a1bd00a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,38 +5,31 @@
 DESTDIR="/"
 
 ##########
-all: keyconvert python wsdl
+all: python wsdl
 
-install: keyconvert-install python-install wsdl-install
+install: python-install wsdl-install xmlbuilder-install 
 
-clean: keyconvert-clean python-clean wsdl-clean
+clean: python-clean wsdl-clean
 
-.PHONY: all install clean 
-
-##########
-keyconvert:
-       $(MAKE) -C keyconvert
+uninstall: python-uninstall
 
-keyconvert-install:
-       $(MAKE) -C keyconvert install
-
-keyconvert-clean:
-       $(MAKE) -C keyconvert clean
-
-.PHONY: keyconvert keyconvert-install keyconvert-clean 
+.PHONY: all install clean 
 
 ##########
 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 
@@ -80,8 +73,8 @@ 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 \
+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