From: Tomi Ollila <tomi.ollila@iki.fi>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [RFC PATCH 6] support make goals after initial {'', dist, data}clean goal(s)
Date: Mon, 16 Jan 2017 20:04:48 +0200 [thread overview]
Message-ID: <20170116180448.3817-1-tomi.ollila@iki.fi> (raw)
In-Reply-To: <8737gucmmi.fsf@tethera.net>
Now make goal combinations starting with *clean goals,
ending with *clean coals, and having non-*clean goals in between
should work. What does not expected to work are
non-*clean - *clean - *non-clean goal combinations.
Also, if first goals are *clean goals, re-creation of Makefile.config
is inhibited when Makefile.config exists and ./configure is newer.
---
Now there is more probability I don't figure out anything that
could be improved (but, if things go as usual, i know that
tomorrow morning ;)
Makefile | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/Makefile b/Makefile
index 0ef57fa..d2010fe 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,35 @@ 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))
+
+# If there are more goals following CLEAN_GOAL, run $(MAKE)s in parts.
+ifneq ($(word 2, $(MAKECMDGOALS)),)
+INCLUDE_MORE := no
+FOLLOWING_GOALS := $(wordlist 2, 99, $(MAKECMDGOALS))
+
+.PHONY: $(FOLLOWING_GOALS) make_in_parts
+$(FOLLOWING_GOALS):
+ @true
+$(CLEAN_GOAL): make_in_parts
+make_in_parts:
+ $(MAKE) $(CLEAN_GOAL)
+ $(MAKE) $(FOLLOWING_GOALS) configure_options="$(configure_options)"
+endif
+
+else
+CLEAN_GOAL :=
+endif
+
+# Potentially speedup make clean, distclean and dataclean ; avoid
+# re-creating 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 +61,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
next prev parent reply other threads:[~2017-01-16 18:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-06 19:32 [RFC PATCH] rfc: make 'make distclean' always use current Makefile.config Tomi Ollila
2017-01-08 2:27 ` David Bremner
2017-01-08 22:08 ` Tomi Ollila
2017-01-11 22:07 ` [RFC PATCH 3] support goals after make *clean, *clean with " Tomi Ollila
2017-01-09 20:06 ` [RFC PATCH 2] opportunistic support for make {, dist, data}clean {all, test, install} Tomi Ollila
2017-01-12 20:38 ` [RFC PATCH 5] support make goals after initial *clean goal(s) Tomi Ollila
2017-01-16 18:04 ` Tomi Ollila [this message]
2017-03-09 13:10 ` [RFC PATCH 6] support make goals after initial {'', dist, data}clean goal(s) David Bremner
2017-03-09 15:51 ` Tomi Ollila
2017-03-10 12:20 ` David Bremner
2017-03-11 14:06 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170116180448.3817-1-tomi.ollila@iki.fi \
--to=tomi.ollila@iki.fi \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).