Merge tag 'debian/0.17-5'

[notmuch] / test / Makefile.local

diff --git a/test/Makefile.local b/test/Makefile.local
index 6a9f15e81500fc9bec9a5c1802c99dcb451eace3..99324ba1e75b790cdc298337b8b6a51c35649ce0 100644 (file)
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -22,12 +22,12 @@ random_corpus_deps =  $(dir)/random-corpus.o  $(dir)/database-test.o \
                        parse-time-string/libparse-time-string.a
 
 $(dir)/random-corpus: $(random_corpus_deps)
-       $(call quiet,CC) $(CFLAGS_FINAL) $^ -o $@ $(CONFIGURE_LDFLAGS)
+       $(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
+$(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
@@ -50,11 +50,6 @@ test:        all test-binaries
 check: test
 
 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)/hex-xcode $(dir)/hex-xcode.o \
+CLEAN += $(TEST_BINARIES) $(addsuffix .o,$(TEST_BINARIES)) \
         $(dir)/database-test.o \
-        $(dir)/random-corpus $(dir)/random-corpus.o \
-        $(dir)/parse-time $(dir)/parse-time.o \
         $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*