X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FMakefile.local;h=916dd0bd6d347e51bf011fe23165e60576c2d91c;hb=344e4c65a43e0755506e065ec001df8b1eae91f7;hp=36b1c1b71de08f598f4b9e314170a3e186c14ec4;hpb=b21f0f68029173035de6616b63320b36d5b1d009;p=notmuch

diff --git a/test/Makefile.local b/test/Makefile.local
index 36b1c1b7..916dd0bd 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -4,7 +4,7 @@ dir := test
 
 # save against changes in $(dir)
 test_src_dir := $(dir)
-extra_cflags += -I.
+extra_cflags += -I$(srcdir)
 
 smtp_dummy_srcs =		\
 	$(notmuch_compat_srcs)	\
@@ -13,10 +13,10 @@ smtp_dummy_srcs =		\
 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 $@
+	$(call quiet,CC) $^ -o $@
 
 $(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a
-	$(call quiet,CC) -I. $^ -o $@ -ltalloc
+	$(call quiet,CC) $^ $(TALLOC_LDFLAGS) -o $@
 
 random_corpus_deps =  $(dir)/random-corpus.o  $(dir)/database-test.o \
 			notmuch-config.o command-line-arguments.o \
@@ -37,12 +37,17 @@ $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o
 
 .PHONY: test check
 
-TEST_BINARIES=$(dir)/arg-test \
-	      $(dir)/hex-xcode \
-	      $(dir)/random-corpus \
-	      $(dir)/parse-time \
-	      $(dir)/smtp-dummy \
-	      $(dir)/symbol-test
+test_main_srcs=$(dir)/arg-test.c \
+	      $(dir)/hex-xcode.c \
+	      $(dir)/random-corpus.c \
+	      $(dir)/parse-time.c \
+	      $(dir)/smtp-dummy.c \
+	      $(dir)/symbol-test.cc \
+
+test_srcs=$(test_main_srcs) $(dir)/database-test.c
+
+TEST_BINARIES := $(test_main_srcs:.c=)
+TEST_BINARIES := $(TEST_BINARIES:.cc=)
 
 test-binaries: $(TEST_BINARIES)
 
@@ -51,7 +56,7 @@ test:	all test-binaries
 
 check: test
 
-SRCS := $(SRCS) $(smtp_dummy_srcs)
+SRCS := $(SRCS) $(test_srcs)
 CLEAN += $(TEST_BINARIES) $(addsuffix .o,$(TEST_BINARIES)) \
 	 $(dir)/database-test.o \
 	 $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*