From: Carl Worth <cworth@cworth.org>
Date: Wed, 10 Mar 2010 18:44:44 +0000 (-0800)
Subject: Makefile: Simplify the conditional message of the all target.
X-Git-Tag: 0.1~52
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=985263cf5108919daf29228cb2827102d0a2272e;ds=sidebyside

Makefile: Simplify the conditional message of the all target.

We wamt a simple "make" to call the 'all' target and then print a
message when done, but we don't want "make install" which depends on
that same 'all' target to print the message.

We previously did this with a separate 'all-without-message' target,
which was inelegant because it caused all users of the target to
carefully depend on 'all-without-message' rather than 'all'.

Instead, we now use a single 'all' target but with a Makefile
conditional that examines the MAKECMDGOALS variable to determine
whether to print the message.
---

diff --git a/Makefile b/Makefile
index ad343239..f4efe1f0 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,8 @@ FINAL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
 FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
 FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
 
-all: all-without-message
+all: notmuch notmuch.1.gz
+ifeq ($(MAKECMDGOALS),)
 	@echo ""
 	@echo "Compilation of notmuch is now complete. You can install notmuch with:"
 	@echo ""
@@ -30,8 +31,7 @@ all: all-without-message
 	@echo "Note that depending on the prefix to which you are installing"
 	@echo "you may need root permission (such as \"sudo make install\")."
 	@echo "See \"./configure --help\" for help on setting an alternate prefix."
-
-all-without-message: notmuch notmuch.1.gz
+endif
 
 # Before including any other Makefile fragments, get settings from the
 # output of configure
diff --git a/Makefile.local b/Makefile.local
index 8d258746..6d29790b 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -26,7 +26,7 @@ notmuch: $(notmuch_client_modules) lib/notmuch.a
 notmuch.1.gz: notmuch.1
 	$(call quiet,gzip) --stdout $^ > $@
 
-install: all-without-message notmuch.1.gz
+install: all notmuch.1.gz
 	for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 ; \
 	do \
 		install -d $$d ; \