Merge branch 'master' into memcache

[plcapi.git] / Makefile

diff --git a/Makefile b/Makefile
index 034846f..8355af5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,15 +8,12 @@
 # $URL$
 #
 
-# Metafiles - manage Legacy/ and Accessors by hand
-init := PLC/__init__.py PLC/Methods/__init__.py 
-
 # python-pycurl and python-psycopg2 avail. from fedora 5
 # we used to ship our own version of psycopg2 and pycurl, for fedora4
 # starting with 5.0, support for these two modules is taken out
 
 # Other stuff - doc not implicit, it's redone by myplc-docs
-subdirs := php php/xmlrpc
+subdirs := php/xmlrpc
 
 # autoconf compatible variables
 DESTDIR := /
@@ -25,7 +22,7 @@ bindir := /usr/bin
 
 PWD := $(shell pwd)
 
-all: $(init) $(subdirs) 
+all: $(subdirs) 
        python setup.py build
 
 install: 
@@ -35,8 +32,6 @@ install:
            --install-data=$(DESTDIR)/$(datadir)/plc_api
        install -D -m 755 php/xmlrpc/xmlrpc.so $(DESTDIR)/$(shell php-config --extension-dir)/xmlrpc.so
 
-$(subdirs): $(init)
-
 $(subdirs): %:
        $(MAKE) -C $@
 
@@ -46,38 +41,8 @@ clean:
        for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir clean ; done
        python setup.py clean && rm -rf build
 
-index: $(init)
-
-index-clean:
-       rm $(init)
-
-#################### regenerate indexes - not used by the build, as both files are svn added - please update as appropriate
-
-########## PLC/
-# the current content of __init__.py
-PLC_now := $(sort $(shell fgrep -v '"' PLC/__init__.py 2>/dev/null))
-# what should be declared
-PLC_paths := $(filter-out %/__init__.py, $(wildcard PLC/*.py))
-PLC_files := $(sort $(notdir $(PLC_paths:.py=)))
-
-ifneq ($(PLC_now),$(PLC_files))
-PLC/__init__.py: force
-endif
-PLC/__init__.py: 
-       (echo '## Please use make index to update this file' ; echo 'all = """' ; cd PLC; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
-
-########## Methods/
-# the current content of __init__.py
-METHODS_now := $(sort $(shell fgrep -v '"' PLC/Methods/__init__.py 2>/dev/null))
-# what should be declared
-METHODS_paths := $(filter-out %/__init__.py, $(wildcard PLC/Methods/*.py PLC/Methods/system/*.py))
-METHODS_files := $(sort $(notdir $(subst system/, system., $(METHODS_paths:.py=))))
-
-ifneq ($(METHODS_now),$(METHODS_files))
-PLC/Methods/__init__.py: force
-endif
-PLC/Methods/__init__.py: 
-       (echo '## Please use make index to update this file' ; echo 'native_methods = """' ; cd PLC/Methods; ls -1 *.py system/*.py | grep -v __init__ | sed -e 's,.py$$,,' -e 's,system/,system.,' ; echo '""".split()') > $@
+index:
+       echo "This step is obsolete"
 
 ##########
 
@@ -123,6 +88,7 @@ ifeq (,$(SSHURL))
 else
        +$(RSYNC) plcsh PLC planetlab5.sql migrations $(SSHURL)/usr/share/plc_api/
        +$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
+       +$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
        $(SSHCOMMAND) exec apachectl graceful
 endif