X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=ef3a354478e736f82a5edfd074f146081d7a2712;hp=5bb570b1a7a4b3f4c6365dd651d8948cdffcc4bc;hb=e94db26c5c7250c82cc2e2445fbb58cdb41847de;hpb=8cbb5114a20c1217f23977fd5edca99a0b7a2955

diff --git a/Makefile.local b/Makefile.local
index 5bb570b1..ef3a3544 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -31,12 +31,17 @@ GPG_FILE=$(SHA1_FILE).asc
 # Smash together user's values with our extra values
 FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
 FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch
+FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
 FINAL_NOTMUCH_LINKER = CC
-ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
+ifeq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
+FINAL_NOTMUCH_LDFLAGS += -Wl,--as-needed
+else
 FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
 FINAL_NOTMUCH_LINKER = CXX
 endif
+ifeq ($(LIBDIR_IN_LDCONFIG),0)
+FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
+endif
 FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
 
 .PHONY: all
@@ -56,10 +61,6 @@ ifeq ($(shell cat .first-build-message 2>/dev/null),)
 endif
 endif
 
-.PHONY: test
-test: all
-	@./test/notmuch-test
-
 $(TAR_FILE):
 	git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD > $(TAR_FILE).tmp
 	echo $(VERSION) > version.tmp
@@ -273,11 +274,20 @@ ifeq ($(MAKECMDGOALS), install)
 	@echo ""
 	@echo "Notmuch is now installed to $(DESTDIR)$(prefix)"
 	@echo ""
-	@echo "To run notmuch from emacs, each user should add the following line to ~/.emacs:"
+	@echo "New users should simply run \"notmuch\" to be guided"
+	@echo "through the process of configuring notmuch and creating"
+	@echo "a database of existing email messages. The \"notmuch\""
+	@echo "command will also offer some sample search commands."
+	@echo ""
+	@echo "Beyond the command-line interface, notmuch also offers"
+	@echo "a full-featured interface for reading and writing mail"
+	@echo "within emacs. To use this, each user should add the"
+	@echo "following line to the ~/.emacs file:"
 	@echo ""
 	@echo "	(require 'notmuch)"
 	@echo ""
-	@echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\""
+	@echo "And then run emacs as \"emacs -f notmuch\" or invoke"
+	@echo "the command \"M-x notmuch\" from within emacs."
 endif
 
 .PHONY: install-desktop