subdirmk: Merge new version and fix everything

[secnet.git] / Dir.sd.mk

diff --git a/Subdir.sd.mk b/Dir.sd.mk
similarity index 98%
rename from Subdir.sd.mk
rename to Dir.sd.mk
index e0096df0dc9296776d6c46eb16141e86efefc5d5..4111476a5b1bc9d0d5c2347b783235252509aa8b 100644 (file)
--- a/Subdir.sd.mk
+++ b/Dir.sd.mk
@@ -44,6 +44,8 @@ CPPFLAGS:=@CPPFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' $(EXTRA_CPPFLAGS)
 LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
 LDLIBS:=@LIBS@ $(EXTRA_LDLIBS)
 
+&:local+global OBJECTS TARGETS
+
 TARGETS:=secnet
 
 OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
@@ -171,7 +173,7 @@ installdirs:
 install: installdirs
        set -e; ok=true; for f in $(STALE_PYTHON_FILES); do \
                if test -e $$f; then \
-                       echo >\&2 "ERROR: $$f still exists "\
+                       echo >&\&2 "ERROR: $$f still exists "\
                                "- try \`make install-force'"; \
                        ok=false; \
                fi; \
@@ -208,9 +210,10 @@ distclean::        realclean
 
 include subdirmk/regen.mk
 
+&:warn !single-char-var
 # Release checklist:
 #
-#  0. Use this checklist from Subdir.sd.mk
+#  0. Use this checklist from Dir.sd.mk
 #
 #  1. Check that the tree has what you want
 #