From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 11 Nov 2019 00:57:54 +0000 (+0000)
Subject: wip
X-Git-Tag: subdirmk/0.1~112
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=cd3afb9014e59028706fdea6361acaf9c74498da;hp=6bdebd83b99b5078fa224236bec2babd9b6a5f54

wip
---

diff --git a/.gitignore b/.gitignore
index 2bd52df..0e76771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,10 @@
 
 ## Autoconf cruft.
 Makefile
+Subdir.mk
+/subdirs.mk
+*.tmp
+
 /autom4te.cache/
 /config.log
 /config.status
diff --git a/Perdir.mk.in b/Perdir.mk.in
index 4e5bb31..06f595f 100644
--- a/Perdir.mk.in
+++ b/Perdir.mk.in
@@ -1,3 +1,3 @@
 
 &DEPFILES += $(patsubst %.o,%.d,$(&OBJECTS))
-include $(&DEPFILES)
+-include $(&DEPFILES)
diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index e08de6e..000417f 100755
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -194,10 +194,11 @@ sub process_tree() {
     foreach my $v (qw(top_srcdir abs_top_srcdir)) {
 	o "$v=\@$v@\n";
     }
-    o "include Subdir.mk\n";
+    o "MAKEFILES += Subdir.mk\n";
     foreach my $subdir (@subdirs) {
-	o "include $subdir/Subdir.mk\n";
+	o "MAKEFILES += $subdir/Subdir.mk\n";
     }
+    o "include \$(MAKEFILES)";
 }
 
 build_tree();