oops

[plcapi.git] / Makefile

diff --git a/Makefile b/Makefile
index e20b903..cc14e56 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,10 @@
 # Copyright (C) 2005 The Trustees of Princeton University
 #
 # $Id$
+# $URL$
 #
 
-# Metafiles
+# Metafiles - manage Legacy/ and Accessors by hand
 init := PLC/__init__.py PLC/Methods/__init__.py PLC/Legacy/__init__.py
 
 # python-pycurl and python-psycopg2 avail. from fedora 5
@@ -63,7 +64,7 @@ ifneq ($(PLC_now),$(PLC_files))
 PLC/__init__.py: force
 endif
 PLC/__init__.py: 
-       (echo 'all = """' ; cd PLC; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
+       (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
@@ -76,7 +77,7 @@ ifneq ($(METHODS_now),$(METHODS_files))
 PLC/Methods/__init__.py: force
 endif
 PLC/Methods/__init__.py: 
-       (echo 'methods = """' ; cd PLC/Methods; ls -1 *.py system/*.py | grep -v __init__ | sed -e 's,.py$$,,' -e 's,system/,system.,' ; echo '""".split()') > $@
+       (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()') > $@
 
 ########## Legacy/
 # the current content of __init__.py
@@ -89,12 +90,12 @@ ifneq ($(LEGACY_now),$(LEGACY_files))
 PLC/Legacy/__init__.py: force
 endif
 PLC/Legacy/__init__.py: 
-       (echo '# each module to define in "methods" the set of methods that it defines' ;\
-        echo '__all__ = """' ; \
-        cd PLC/Legacy; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; \
-        echo '""".split()') > $@
+       (echo '## Please use make index to update this file' ; echo 'native_methods = """' ; cd PLC/Legacy; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' -e 's,system/,system.,' ; echo '""".split()') > $@
 
 ##########
+
+
+
 force:
 
 .PHONY: all install force clean index tags $(subdirs)
@@ -135,7 +136,7 @@ ifeq (,$(SSHURL))
        @echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
        @exit 1
 else
-       +$(RSYNC) PLC planetlab5.sql migrations $(SSHURL)/usr/share/plc_api/
+       +$(RSYNC) plcsh PLC planetlab5.sql migrations $(SSHURL)/usr/share/plc_api/
        $(SSHCOMMAND) exec apachectl graceful
 endif