From 70f1ee6031764b7282ab68ed5498e028a7ca3aa7 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Tue, 15 Jan 2013 05:29:40 +0000 Subject: [PATCH] [Build] Dependencies weren't being built or included for the unit tests. --- Makefile.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3dc06ea..bbfd58c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -81,7 +81,6 @@ test-programs: $(TEST_PROGRAMS) .SUFFIXES: .d -# FIXME: not working %.d: %.cc $(CXX) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(CXXFLAGS) $< > $@.$$$$;\ sed 's,\([^ :]*\)\.o[ :]*,\1.o $@ : Makefile ,g' < $@.$$$$ > $@; \ @@ -161,12 +160,11 @@ install: $(PROGRAMS) $(INSTALL_DATA) man8/thin_restore.8 $(MANPATH)/man8/thin_restore.8 .PHONY: install -ifeq (,$(findstring $(MAKECMDGOALS),clean distclean)) - -include $(subst .cc,.d,$(SOURCE)) - -include $(subst .cc,.d,$(TEST_SOURCE)) - -include $(subst .cc,.d,$(PROGRAM_SOURCE)) -endif - ifeq ("@TESTING@", "yes") include unit-tests/Makefile endif + +-include $(subst .cc,.d,$(SOURCE)) +-include $(subst .cc,.d,$(TEST_SOURCE)) +-include $(subst .cc,.d,$(PROGRAM_SOURCE)) +