From 46f587dabe0d36473aaf444fea8cc94232860c41 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 14 Nov 2019 00:20:07 +0000 Subject: [PATCH] subdirmk: Rename MAKEFILES variable This is very magic to make and the behaviour is very undesirable. Signed-off-by: Ian Jackson --- subdirmk/generate | 6 +++--- subdirmk/regen.mk.in | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/subdirmk/generate b/subdirmk/generate index 14e18c0..b1d032b 100755 --- a/subdirmk/generate +++ b/subdirmk/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/subdirmk/regen.mk.in b/subdirmk/regen.mk.in index 0e2318b..a9fd30c 100644 --- a/subdirmk/regen.mk.in +++ b/subdirmk/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) -- 2.30.2