From edb33dce4c1f2de22e71b9d69ffd7d31d484205b Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Fri, 22 Mar 2013 12:10:51 +0000 Subject: [PATCH] Put build dependencies in for gmock --- unit-tests/Makefile.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/unit-tests/Makefile.in b/unit-tests/Makefile.in index 05df04b..e686eba 100644 --- a/unit-tests/Makefile.in +++ b/unit-tests/Makefile.in @@ -82,7 +82,13 @@ GMOCK_INCLUDES=\ GMOCK_LIBS=\ -Llib -lgmock -lpthread -lib/gmock.a: +GMOCK_DEPS=\ + $(wildcard $(GMOCK_DIR)/include/*.h) \ + $(wildcard $(GMOCK_DIR)/src/*.cc) \ + $(wildcard $(GMOCK_DIR)/gtest/include/*.h) \ + $(wildcard $(GMOCK_DIR)/gtest/src/*.cc) + +lib/libgmock.a: $(GMOCK_DEPS) g++ $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/gtest -c $(GMOCK_DIR)/gtest/src/gtest-all.cc g++ $(GMOCK_INCLUDES) -I$(GMOCK_DIR) -c $(GMOCK_DIR)/src/gmock-all.cc ar -rv lib/libgmock.a gtest-all.o gmock-all.o @@ -101,7 +107,7 @@ MOCK_SOURCE=\ MOCK_OBJECTS=$(subst .cc,.gmo,$(MOCK_SOURCE)) -unit-tests/gmock_tests: $(MOCK_OBJECTS) lib/gmock.a +unit-tests/gmock_tests: $(MOCK_OBJECTS) lib/libgmock.a g++ $(CXXFLAGS) -o $@ $(MOCK_OBJECTS) $(LIBS) $(GMOCK_LIBS) all: $(TEST_PROGRAMS)