[RFC PATCH 5] support make goals after initial *clean goal(s)

Tomi Ollila tomi.ollila at iki.fi
Thu Jan 12 12:38:57 PST 2017


Now make goal combinations starting with *clean goals,
ending with *clean coals, and having non-*clean goals in between
should work. What does not work is non-clean -- clean -- non-clean
goal combination.
Also, initial *clean goals do not request re-creation of
Makefile.config if it exists and ./configure is newer.
---

If someone did not lost count, those can notice that I did not send
patch #4. it was quick fix for #3 -- but both had problem (which I
could not test) that phony/targets that do not stamp itself to the
filesystem would be run multiple time in #3.

Now, this is even simpler, more robust and everything -- just
that some more testing is needed (if not for anything else, for
verifying that my claims in the commit message are accurate).

and now I also got the difference between goals and targets.
goals are those which user give from command line (or default,
if none) -- targets are those defined in the makefiles, which
defines how to reach these goals.

 Makefile | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/Makefile b/Makefile
index 0ef57fa..ffab290 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,30 @@ include Makefile.config
 global_deps = Makefile Makefile.config Makefile.local \
 	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
+INCLUDE_MORE := yes
+ifneq ($(filter clean distclean dataclean, $(word 1, $(MAKECMDGOALS))),)
+CLEAN_GOAL := $(word 1, $(MAKECMDGOALS))
+
+ifneq ($(word 2, $(MAKECMDGOALS)),)
+INCLUDE_MORE := no
+$(CLEAN_GOAL): make_in_parts
+.PHONY: make_in_parts
+make_in_parts:
+	$(MAKE) $(CLEAN_GOAL)
+	$(MAKE) $(wordlist 2, 99, $(MAKECMDGOALS)) configure_options=$(configure_options)
+endif
+
+else
+CLEAN_GOAL :=
+endif
+
+# Potentially speedup make clean, distclean and dataclean ; avoid
+# re-creation of Makefile.config if it exists but configure is newer.
+ifneq ($(CLEAN_GOAL),)
+Makefile.config: | $(srcdir)/configure
+else
 Makefile.config: $(srcdir)/configure
+endif
 ifeq ($(configure_options),)
 	@echo ""
 	@echo "Note: Calling ./configure with no command-line arguments. This is often fine,"
@@ -33,9 +56,11 @@ ifeq ($(configure_options),)
 endif
 	$(srcdir)/configure $(configure_options)
 
+ifeq ($(INCLUDE_MORE),yes)
 # runtime variable definitions available in all subdirs
 include $(srcdir)/Makefile.global
 # Finally, include all of the Makefile.local fragments where all the
 # real work is done.
 
 include $(subdirs:%=%/Makefile.local) Makefile.local
+endif
-- 
2.9.3



More information about the notmuch mailing list