X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FMakefile.local;h=4a6a4b12e862253c3964ec203aa45734825d3f19;hb=7400e18fb5f532524146f7083bf964c7e501bdc8;hp=646779e19fb7af0ba195d3bf601723d9ffbbc3bb;hpb=945196d79b56356aef945fad6f34a6a1a3a97ce1;p=notmuch

diff --git a/test/Makefile.local b/test/Makefile.local
index 646779e1..4a6a4b12 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -2,22 +2,33 @@
 
 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 -lxapian
 
 .PHONY: test check
-test:	all $(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