X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=1851f23b0c96bcefc2ff105264ded48a6e8346d7;hb=a8026bd981fbc99e44b74f1b3780805f21e23da2;hp=3ec7bc4d574eb152fd827863a17c550077191d54;hpb=28c6cd0924b6fc7e96ee9bf21ad0e69168cd48e9;p=plcapi.git

diff --git a/Makefile b/Makefile
index 3ec7bc4..1851f23 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,27 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.6 2006/11/08 21:56:32 mlhuang Exp $
+# $Id: Makefile,v 1.10 2006/12/15 16:20:20 mlhuang Exp $
 #
 
 # Metafiles
-INIT := PLC/__init__.py PLC/Methods/__init__.py
+init := PLC/__init__.py PLC/Methods/__init__.py
+
+# Python modules
+modules := psycopg2
+
+# Temporarily until we can kill the Fedora Core 2 build
+curl_vernum := $(shell printf %d 0x$(shell curl-config --vernum))
+pycurl_vernum := $(shell printf %d 0x070d01) # 7.13.1
+ifeq ($(shell test $(curl_vernum) -ge $(pycurl_vernum) && echo 1),1)
+modules += pycurl
+endif
+
+modules-install := $(foreach module, $(modules), $(module)-install)
+modules-clean := $(foreach module, $(modules), $(module)-clean)
 
 # Other stuff
-SUBDIRS := doc php
+subdirs := doc php php/xmlrpc
 
 # autoconf compatible variables
 DESTDIR := /plc/root
@@ -20,37 +33,45 @@ bindir := /usr/bin
 
 PWD := $(shell pwd)
 
-all: $(INIT) $(SUBDIRS)
+all: $(init) $(subdirs) $(modules)
 	python setup.py build
-        # Install in the current directory so that we can import it
-	cd psycopg2 && \
-	python setup.py build && \
-	python setup.py install --install-lib=$(PWD)
 
-install:
+install: $(modules-install)
 	python setup.py install \
 	    --install-purelib=$(DESTDIR)/$(datadir)/plc_api \
 	    --install-scripts=$(DESTDIR)/$(datadir)/plc_api \
 	    --install-data=$(DESTDIR)/$(datadir)/plc_api
-	(cd psycopg2 && \
-	 python setup.py install --install-lib=$(DESTDIR)/$(datadir)/plc_api)
+	install -D -m 755 php/xmlrpc/xmlrpc.so $(DESTDIR)/$(shell php-config --extension-dir)/xmlrpc.so
+
+$(subdirs): $(init) $(modules)
 
-$(SUBDIRS): %:
+$(subdirs): %:
 	$(MAKE) -C $@
 
-clean:
+$(modules):
+        # Install in the current directory so that we can import it while developing
+	cd $@ && \
+	    python setup.py build && \
+	    python setup.py install_lib --install-dir=$(PWD)
+
+$(modules-install): %-install:
+	cd $* && \
+	    python setup.py install_lib --install-dir=$(DESTDIR)/$(datadir)/plc_api
+
+$(modules-clean): %-clean:
+	cd $* && python setup.py clean && rm -rf build
+
+clean: $(modules-clean)
 	find . -name '*.pyc' | xargs rm -f
 	rm -f $(INIT)
 	for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir clean ; done
 	python setup.py clean && rm -rf build
-	cd psycopg2 && python setup.py clean && rm -rf build
 
-index: $(INIT)
+index: $(init)
 
 tags:
 	find . '(' -name '*.py' -o -name '*.sql' -o -name '*.php' -o -name Makefile ')' | xargs etags
 
-
 # All .py files in PLC/
 PLC := $(filter-out %/__init__.py, $(wildcard PLC/*.py))
 PLC_init := all = '$(notdir $(PLC:.py=))'.split()
@@ -75,4 +96,4 @@ endif
 
 force:
 
-.PHONY: all install force clean index tags $(SUBDIRS)
+.PHONY: all install force clean index tags $(subdirs) $(modules)