X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FMakefile.local;h=45df4c718fb47f3545202f3d02e75c993cd47338;hb=5a48340bf19c42ccdec9b1777a42a79f6884f49f;hp=bffbbdbdc0e2aa797b8895baef4049fab9a59003;hpb=7bf1f6e85a1af283c62fcf5f305b762e20706a42;p=notmuch

diff --git a/test/Makefile.local b/test/Makefile.local
index bffbbdbd..45df4c71 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -2,25 +2,34 @@
 
 dir := test
 
+extra_cflags += -I.
+
 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) -I. $^ -o $@
+
 $(dir)/smtp-dummy: $(smtp_dummy_modules)
 	$(call quiet,CC) $^ -o $@
 
 $(dir)/symbol-test: $(dir)/symbol-test.o
-	$(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian
+	$(call quiet,CXX) $^ -o $@ -Llib -lnotmuch $(XAPIAN_LDFLAGS)
 
 .PHONY: test check
 
-test-binaries: $(dir)/smtp-dummy $(dir)/symbol-test
+test-binaries: $(dir)/arg-test $(dir)/smtp-dummy $(dir)/symbol-test
 
 test:	all test-binaries
 	@${dir}/notmuch-test $(OPTIONS)
 
 check: test
 
-CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o $(dir)/symbol-test $(dir)/symbol-test.o
+SRCS := $(SRCS) $(smtp_dummy_srcs)
+CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \
+	 $(dir)/symbol-test $(dir)/symbol-test.o \
+	 $(dir)/arg-test $(dir)/arg-test.o \
+	 $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*