subdirmk: Rename MAKEFILES variable

This is very magic to make and the behaviour is very undesirable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/generate b/generate
index 14e18c0899a58c2a729d4e06bc398c4adbe1ba24..b1d032bb3e96c62e192d6e35eb726c6e2a931114 100755 (executable)
--- a/generate
+++ b/generate
@@ -264,14 +264,14 @@ sub process_tree() {
     foreach my $v (qw(top_srcdir abs_top_srcdir)) {
        o "$v=\@$v@\n";
     }
-    o "MAKEFILES += Subdir.mk\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();

diff --git a/regen.mk.in b/regen.mk.in
index 0e2318b52ea7ec56f77cf4750a9ed1fbfd6cd84e..a9fd30c06b5e6bd1587ae4f4425dec389345aeba 100644 (file)
--- a/regen.mk.in
+++ b/regen.mk.in
@@ -35,7 +35,7 @@ MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \
        @_SUBDIRMK_MAKEFILES@ \
        ))
 
-main.mk $(MAKEFILES) $(CONFIG_STATUS_OUTPUTS): .makefiles.stamp ;
+main.mk $(SUBDIRMK_MAKEFILES) $(CONFIG_STATUS_OUTPUTS): .makefiles.stamp ;
 .makefiles.stamp:                                              \
                $(top_srcdir)/subdirmk/generate                 \
                $(CONFIG_STATUS)                                \
@@ -59,7 +59,7 @@ main.mk $(MAKEFILES) $(CONFIG_STATUS_OUTPUTS): .makefiles.stamp ;
 
 realclean:: clean
        $(RM) config.status config.log
-       $(RM) main.mk $(MAKEFILES) @_SUBDIRMK_MAKEFILES@
-       $(RM) $(addsuffix Makefile,$(dir $(MAKEFILES)))
+       $(RM) main.mk $(SUBDIRMK_MAKEFILES) @_SUBDIRMK_MAKEFILES@
+       $(RM) $(addsuffix Makefile,$(dir $(SUBDIRMK_MAKEFILES)))
 
 -include $(ALL_DEPFILES)