test: make smtp-dummy work with Emacs 24

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 2c07bd789df1d3f35fc60a09e33f7561172f4631..6ddef5c883b56a5970a9e96cb25f5e417b5f3ae0 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -39,7 +39,7 @@ PV_FILE=bindings/python/notmuch/version.py
 # 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 $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
+FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
 FINAL_NOTMUCH_LINKER = CC
 ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
 FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
@@ -130,6 +130,17 @@ pre-release:
        mkdir -p releases
        mv $(TAR_FILE) $(DEB_TAR_FILE) releases
 
+.PHONY: debian-snapshot
+debian-snapshot: TMPFILE := $(shell mktemp)
+debian-snapshot:
+       make VERSION=$(VERSION) clean
+       cp debian/changelog $(TMPFILE)
+       EDITOR=/bin/true dch -v $(VERSION)+1 -D UNRELEASED 'test build, not for upload'
+       echo '3.0 (native)' > debian/source/format
+       debuild -us -uc
+       mv -f $(TMPFILE) debian/changelog
+       echo '3.0 (quilt)' > debian/source/format
+
 .PHONY: release-message
 release-message:
        @echo "To: notmuch@notmuchmail.org"
@@ -288,12 +299,11 @@ notmuch_client_srcs =             \
        notmuch-time.c          \
        query-string.c          \
        show-message.c          \
-       json.c                  \
-       xutil.c
+       json.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 
-notmuch: $(notmuch_client_modules) lib/libnotmuch.a
+notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a
        $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
 
 notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)