Fix dependency generation for compat, test, and util

[notmuch] / test / Makefile.local

diff --git a/test/Makefile.local b/test/Makefile.local
index 9b3308a1bbb511840818396a69b5d55125805e0b..4a6a4b12e862253c3964ec203aa45734825d3f19 100644 (file)
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -2,19 +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,CXX) $^ -o $@ -Llib -lnotmuch -lxapian
+
 .PHONY: test check
-test:  all $(dir)/smtp-dummy
+
+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
+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