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.
This commit is contained in:
Carl Worth 2010-03-10 10:44:44 -08:00
parent adf5c5ec35
commit 985263cf51
2 changed files with 4 additions and 4 deletions

View file

@ -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_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
all: all-without-message all: notmuch notmuch.1.gz
ifeq ($(MAKECMDGOALS),)
@echo "" @echo ""
@echo "Compilation of notmuch is now complete. You can install notmuch with:" @echo "Compilation of notmuch is now complete. You can install notmuch with:"
@echo "" @echo ""
@ -30,8 +31,7 @@ all: all-without-message
@echo "Note that depending on the prefix to which you are installing" @echo "Note that depending on the prefix to which you are installing"
@echo "you may need root permission (such as \"sudo make install\")." @echo "you may need root permission (such as \"sudo make install\")."
@echo "See \"./configure --help\" for help on setting an alternate prefix." @echo "See \"./configure --help\" for help on setting an alternate prefix."
endif
all-without-message: notmuch notmuch.1.gz
# Before including any other Makefile fragments, get settings from the # Before including any other Makefile fragments, get settings from the
# output of configure # output of configure

View file

@ -26,7 +26,7 @@ notmuch: $(notmuch_client_modules) lib/notmuch.a
notmuch.1.gz: notmuch.1 notmuch.1.gz: notmuch.1
$(call quiet,gzip) --stdout $^ > $@ $(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 ; \ for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 ; \
do \ do \
install -d $$d ; \ install -d $$d ; \