Merge from secnet

diff --git a/README b/README
index 27dd8556a77c05ecd047b7aaa5aa23c3a7f2957e..fcf8c000f89a6ea61f92deca0a1aabaa420fce96 100644 (file)
--- a/README
+++ b/README
@@ -183,7 +183,7 @@ In more detail, with all the various options laid out:
              for      build     source       build         source
                                                        
   This       lc       &file     &^file       $(PWD)/&file  $(abs_src)/&file
-  directory  any      &/file    &^/file      $(PWD)&/file  $(abs_src)/&/file
+  directory  any      &/file    &^/file      $(PWD)/&file  $(abs_src)/&/file
              several  & f g h   &^ f g h     $(addprefix...)
                                              
   Top        lc       file      &~file

diff --git a/generate b/generate
index 32c6fbf61a7ba1ffcd48f9b79402f6951ddfd6e5..9275b25770b818e8346a6c11b0ba532c9e2e4de7 100755 (executable)
--- a/generate
+++ b/generate
@@ -258,6 +258,11 @@ sub process_subtree ($$) {
        }
        print O "\n";
     }
+    if (@targets) {
+       print O ".PHONY:";
+       print O " ${dir_prefix}${_}" foreach @targets;
+       print O "\n";
+    }
 
     return @targets;
 }

diff --git a/regen.mk.in b/regen.mk.in
index c4002a623a650a5127eb40c0d29b4c3c8c7cf57a..5f24b08fd4e504cc50019a276df7850abb9b9dbf 100644 (file)
--- a/regen.mk.in
+++ b/regen.mk.in
@@ -44,10 +44,10 @@ main.mk $(SUBDIRMK_MAKEFILES) $(CONFIG_STATUS_OUTPUTS): .makefiles.stamp
 # This filtering arranges that we can often run config.status to
 # generate only particular output files.  We look for *inputs* that
 # have changed.  If the only inputs that have changed are ones that we
-# know affect only one output (Subdir.mk.in and regen.mk.in), we pass
+# know affect only one output (Subdir.sd.mk and *.mk.in), we pass
 # config.status the corresponding output file names.  Otherwise we
 # pass nothing and config.status does them all.  We need to mention
-# regen.mk.in twice because if $(top_srcdir) is `.', make elides the
+# Subdir.sd.mk twice because if $(top_srcdir) is `.', make elides the
 # directory part from $?.
        ./$(CONFIG_STATUS) $(if                                 \
                $(filter-out Subdir.sd.mk %/Subdir.sd.mk        \