util: Fix two corner-cases in boolean term quoting function

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 2b91946553085ba60ecd420df7138d55e24b9acd..5f797ad004dd836c813272da585f66e0cc06c771 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -39,8 +39,8 @@ GPG_FILE=$(SHA1_FILE).asc
 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_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
+FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)
 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)
@@ -95,7 +95,7 @@ dist: $(TAR_FILE)
 
 .PHONY: update-versions
 
-update-versions: update-man-versions
+update-versions:
        sed -i "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" $(PV_FILE)
 
 # We invoke make recursively only to force ordering of our phony
@@ -236,12 +236,12 @@ endif
 quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))
 
 %.o: %.cc $(global_deps)
-       @mkdir -p .deps/$(@D)
-       $(call quiet,CXX $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
+       @mkdir -p $(patsubst %/.,%,.deps/$(@D))
+       $(call quiet,CXX $(CPPFLAGS) $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
 
 %.o: %.c $(global_deps)
-       @mkdir -p .deps/$(@D)
-       $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
+       @mkdir -p $(patsubst %/.,%,.deps/$(@D))
+       $(call quiet,CC $(CPPFLAGS) $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
 
 .PHONY : clean
 clean:
@@ -255,12 +255,13 @@ notmuch_client_srcs =             \
        command-line-arguments.c\
        debugger.c              \
        gmime-filter-reply.c    \
-       gmime-filter-headers.c  \
        hooks.c                 \
        notmuch.c               \
+       notmuch-compact.c       \
        notmuch-config.c        \
        notmuch-count.c         \
        notmuch-dump.c          \
+       notmuch-insert.c        \
        notmuch-new.c           \
        notmuch-reply.c         \
        notmuch-restore.c       \
@@ -270,10 +271,12 @@ notmuch_client_srcs =             \
        notmuch-tag.c           \
        notmuch-time.c          \
        sprinter-json.c         \
+       sprinter-sexp.c         \
        sprinter-text.c         \
        query-string.c          \
        mime-node.c             \
        crypto.c                \
+       tag-util.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 
@@ -322,3 +325,5 @@ DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config
 DEPS := $(SRCS:%.c=.deps/%.d)
 DEPS := $(DEPS:%.cc=.deps/%.d)
 -include $(DEPS)
+
+.SUFFIXES: # Delete the default suffixes. Old-Fashioned Suffix Rules not used.