smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)
-$(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a
- $(call quiet,CC) $^ -o $@
+$(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libnotmuch_util.a
+ $(call quiet,CC) $^ -o $@ $(LDFLAGS)
-$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a
- $(call quiet,CC) $^ $(TALLOC_LDFLAGS) -o $@
+$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libnotmuch_util.a
+ $(call quiet,CC) $^ -o $@ $(LDFLAGS) $(TALLOC_LDFLAGS)
random_corpus_deps = $(dir)/random-corpus.o $(dir)/database-test.o \
- notmuch-config.o command-line-arguments.o \
- lib/libnotmuch.a util/libutil.a \
+ notmuch-config.o status.o command-line-arguments.o \
+ lib/libnotmuch.a util/libnotmuch_util.a \
parse-time-string/libparse-time-string.a
$(dir)/random-corpus: $(random_corpus_deps)
- $(call quiet,CXX) $(CFLAGS_FINAL) $^ -o $@ $(CONFIGURE_LDFLAGS)
+ $(call quiet,CXX) $^ -o $@ $(LDFLAGS) $(CONFIGURE_LDFLAGS)
$(dir)/smtp-dummy: $(smtp_dummy_modules)
- $(call quiet,CC) $^ -o $@
+ $(call quiet,CC) $^ -o $@ $(LDFLAGS)
$(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME)
- $(call quiet,CXX) $^ -o $@ -Llib -lnotmuch $(XAPIAN_LDFLAGS)
+ $(call quiet,CXX) $^ -o $@ $(LDFLAGS) -Llib -lnotmuch $(XAPIAN_LDFLAGS)
$(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o
- $(call quiet,CC) $^ -o $@
+ $(call quiet,CC) $^ -o $@ $(LDFLAGS)
$(dir)/make-db-version: $(dir)/make-db-version.o
- $(call quiet,CXX) $^ -o $@ $(XAPIAN_LDFLAGS)
+ $(call quiet,CXX) $^ -o $@ $(LDFLAGS) $(XAPIAN_LDFLAGS)
+
+$(dir)/ghost-report: $(dir)/ghost-report.o
+ $(call quiet,CXX) $^ -o $@ $(LDFLAGS) $(XAPIAN_LDFLAGS)
.PHONY: test check
$(dir)/smtp-dummy.c \
$(dir)/symbol-test.cc \
$(dir)/make-db-version.cc \
+ $(dir)/ghost-report.cc
test_srcs=$(test_main_srcs) $(dir)/database-test.c
test-binaries: $(TEST_BINARIES)
test: all test-binaries
+ifeq ($V,)
+ @echo 'Use "$(MAKE) V=1" to see the details for passing and known broken tests.'
+ @env NOTMUCH_TEST_QUIET=1 ${test_src_dir}/notmuch-test $(OPTIONS)
+else
+# The user has explicitly enabled quiet execution.
+ifeq ($V,0)
+ @env NOTMUCH_TEST_QUIET=1 ${test_src_dir}/notmuch-test $(OPTIONS)
+else
@${test_src_dir}/notmuch-test $(OPTIONS)
+endif
+endif
check: test
SRCS := $(SRCS) $(test_srcs)
CLEAN += $(TEST_BINARIES) $(addsuffix .o,$(TEST_BINARIES)) \
$(dir)/database-test.o \
- $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*
+ $(dir)/corpora.mail $(dir)/test-results $(dir)/tmp.*