Makefile: Make "make release" run the test suite.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 5da542422f75667953a65b2eab0a3404dd1f504e..3f8f1d56c81add165cd5844cf0ed471f635bcf58 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -23,6 +23,9 @@ GPG_FILE=$(SHA1_FILE).asc
 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
+ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
+FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
+endif
 FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
 
 .PHONY: all
@@ -42,6 +45,10 @@ ifeq ($(shell cat .first-build-message),)
 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
@@ -63,7 +70,9 @@ dist: $(TAR_FILE)
 # We invoke make recursively only to force ordering of our phony
 # targets in the case of parallel invocation of make (-j).
 .PHONY: release
-release: release-verify-newer
+release:
+       $(MAKE) test
+       $(MAKE) release-verify-newer
        $(MAKE) release-upload
        @echo "Please send a release announcement as follows:"
        @echo ""
@@ -174,7 +183,6 @@ clean:
 distclean: clean
 
 notmuch_client_srcs =          \
-       $(notmuch_compat_srcs)  \
        debugger.c              \
        gmime-filter-reply.c    \
        gmime-filter-headers.c  \
@@ -200,7 +208,7 @@ notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/libnotmuch.a
        $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
 
-notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so
+notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
        $(call quiet,CXX $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1