emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Build] Dependencies weren't being built or included for the unit tests.

Browse Source
This commit is contained in:
Joe Thornber 2013-01-15 05:29:40 +00:00
parent 2aff80ea78
commit 70f1ee6031
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.in
View File

@ -81,7 +81,6 @@ test-programs: $(TEST_PROGRAMS)
.SUFFIXES: .d .SUFFIXES: .d
# FIXME: not working
%.d: %.cc %.d: %.cc
$(CXX) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(CXXFLAGS) $< > $@.$$$$;\ $(CXX) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(CXXFLAGS) $< > $@.$$$$;\
sed 's,\([^ :]*\)\.o[ :]*,\1.o $@ : Makefile ,g' < $@.$$$$ > $@; \ sed 's,\([^ :]*\)\.o[ :]*,\1.o $@ : Makefile ,g' < $@.$$$$ > $@; \
@ -161,12 +160,11 @@ install: $(PROGRAMS)
$(INSTALL_DATA) man8/thin_restore.8 $(MANPATH)/man8/thin_restore.8 $(INSTALL_DATA) man8/thin_restore.8 $(MANPATH)/man8/thin_restore.8
.PHONY: install .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") ifeq ("@TESTING@", "yes")
include unit-tests/Makefile include unit-tests/Makefile
endif endif
-include $(subst .cc,.d,$(SOURCE))
-include $(subst .cc,.d,$(TEST_SOURCE))
-include $(subst .cc,.d,$(PROGRAM_SOURCE))