X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=a1bd00a1c538713b7df59bdafbb5e9ef53b357bd;hb=4a1617a50faad4d0871048a9ba3325ac69867754;hp=fc89a214fb37a068bbdeecc7aaa6e0eac1a3332b;hpb=8f4c514a32011dc469dd98f8fdb5892e18db41dc;p=sfa.git

diff --git a/Makefile b/Makefile
index fc89a214..a1bd00a1 100644
--- 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