Merge commit 'c0b216c79763f720df20e002fc14c9348a0e05c2'

[secnet.git] / subdirmk / generate

diff --git a/subdirmk/generate b/subdirmk/generate
index 8a5daa6b0fc6269cfc6c2cba935b957a0c62e8e2..0bb4b7b3501014b9696e782b95c3186494113c51 100755 (executable)
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -138,7 +138,7 @@ sub process_input_mk ($$$$$$$$) {
        for (;;) {
            unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
            o $1;
-           if ($2) { o $$esclitr; next; }
+           if ($2) { s#^$esc##; o $$esclitr; next; }
            s{^$esc}{} or die "$_ ?";
            if (s{^$esc}{}) { o "$$esclitr$$esclitr" }
            elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
@@ -165,6 +165,8 @@ sub process_input_mk ($$$$$$$$) {
                s{(?<=[ \t])(?=\S)(?!\\\s*$)}{$prefix}g;
                o $_;
                $_ = $after;
+           } elsif (s{^\#}{}) {
+               $_ = '';
            } elsif (s{^![ \t]+}{}) {
                o $_;
                $_ = '';
@@ -262,14 +264,16 @@ sub process_tree() {
     foreach my $v (qw(top_srcdir abs_top_srcdir)) {
        o "$v=\@$v@\n";
     }
-    o "MAKEFILES += Subdir.mk\n";
+    o "SUBDIRMK_MAKEFILES :=\n";
+    o "MAKEFILE_TEMPLATES :=\n";
+    o "SUBDIRMK_MAKEFILES += Subdir.mk\n";
     foreach my $subdir (@subdirs) {
-       o "MAKEFILES += $subdir/Subdir.mk\n";
+       o "SUBDIRMK_MAKEFILES += $subdir/Subdir.mk\n";
     }
     foreach my $input (sort keys %input_files) {
        o "MAKEFILE_TEMPLATES += $input\n";
     }
-    o "include \$(MAKEFILES)";
+    o "include \$(SUBDIRMK_MAKEFILES)";
 }
 
 build_tree();