X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2FMakefile.local;h=1c85b18adc414ea69d5b491b3c87c97e0dd39c3e;hp=7b602bcf88fadfb35fdc50377f62c7a90f513d59;hb=c2d8236b56e713ae2e7053c9ea3cc13f7d1283c4;hpb=44ea57a0d10ddab514abea319c4d25ec4e36b51e

diff --git a/test/Makefile.local b/test/Makefile.local
index 7b602bcf..1c85b18a 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -2,13 +2,56 @@
 
 dir := test
 
-$(dir)/smtp-dummy: $(dir)/smtp-dummy.c
+# save against changes in $(dir)
+test_src_dir := $(dir)
+extra_cflags += -I$(srcdir)
+
+smtp_dummy_srcs =		\
+	$(notmuch_compat_srcs)	\
+	$(dir)/smtp-dummy.c
+
+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)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a
+	$(call quiet,CC) $^ $(TALLOC_LDFLAGS) -o $@
+
+random_corpus_deps =  $(dir)/random-corpus.o  $(dir)/database-test.o \
+			notmuch-config.o command-line-arguments.o \
+			lib/libnotmuch.a util/libutil.a \
+			parse-time-string/libparse-time-string.a
+
+$(dir)/random-corpus: $(random_corpus_deps)
+	$(call quiet,CXX) $(CFLAGS_FINAL) $^ -o $@ $(CONFIGURE_LDFLAGS)
+
+$(dir)/smtp-dummy: $(smtp_dummy_modules)
+	$(call quiet,CC) $^ -o $@
+
+$(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME)
+	$(call quiet,CXX) $^ -o $@ -Llib -lnotmuch $(XAPIAN_LDFLAGS)
+
+$(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o
 	$(call quiet,CC) $^ -o $@
 
 .PHONY: test check
-test:	all $(dir)/smtp-dummy
-	@${dir}/notmuch-test $(OPTIONS)
+
+TEST_BINARIES=$(dir)/arg-test \
+	      $(dir)/hex-xcode \
+	      $(dir)/random-corpus \
+	      $(dir)/parse-time \
+	      $(dir)/smtp-dummy \
+	      $(dir)/symbol-test
+
+test-binaries: $(TEST_BINARIES)
+
+test:	all test-binaries
+	@${test_src_dir}/notmuch-test $(OPTIONS)
 
 check: test
 
-CLEAN := $(CLEAN) $(dir)/smtp-dummy
+SRCS := $(SRCS) $(smtp_dummy_srcs)
+CLEAN += $(TEST_BINARIES) $(addsuffix .o,$(TEST_BINARIES)) \
+	 $(dir)/database-test.o \
+	 $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*