From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 666136DE02C9 for ; Thu, 12 Jan 2017 12:39:21 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.179 X-Spam-Level: X-Spam-Status: No, score=0.179 tagged_above=-999 required=5 tests=[AWL=0.188, HEADER_FROM_DIFFERENT_DOMAINS=0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b-4PrZdxkgEq for ; Thu, 12 Jan 2017 12:39:20 -0800 (PST) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by arlo.cworth.org (Postfix) with ESMTP id CA6AB6DE0222 for ; Thu, 12 Jan 2017 12:39:19 -0800 (PST) Received: by guru.guru-group.fi (Postfix, from userid 501) id 1E3661001CD; Thu, 12 Jan 2017 22:38:59 +0200 (EET) From: Tomi Ollila To: notmuch@notmuchmail.org Cc: tomi.ollila@iki.fi Subject: [RFC PATCH 5] support make goals after initial *clean goal(s) Date: Thu, 12 Jan 2017 22:38:57 +0200 Message-Id: <20170112203857.24659-1-tomi.ollila@iki.fi> X-Mailer: git-send-email 2.11.0 In-Reply-To: <8737gucmmi.fsf@tethera.net> References: <8737gucmmi.fsf@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 20:39:21 -0000 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