Put build dependencies in for gmock

This commit is contained in:
Joe Thornber 2013-03-22 12:10:51 +00:00
parent c044c2c729
commit edb33dce4c

View File

@ -82,7 +82,13 @@ GMOCK_INCLUDES=\
GMOCK_LIBS=\ GMOCK_LIBS=\
-Llib -lgmock -lpthread -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)/gtest -c $(GMOCK_DIR)/gtest/src/gtest-all.cc
g++ $(GMOCK_INCLUDES) -I$(GMOCK_DIR) -c $(GMOCK_DIR)/src/gmock-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 ar -rv lib/libgmock.a gtest-all.o gmock-all.o
@ -101,7 +107,7 @@ MOCK_SOURCE=\
MOCK_OBJECTS=$(subst .cc,.gmo,$(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) g++ $(CXXFLAGS) -o $@ $(MOCK_OBJECTS) $(LIBS) $(GMOCK_LIBS)
all: $(TEST_PROGRAMS) all: $(TEST_PROGRAMS)