From: Steinar H. Gunderson Date: Thu, 11 Oct 2012 23:50:44 +0000 (+0200) Subject: Fix an overly aggressive search-and-replace in the Makefile. X-Git-Tag: 1.0~313 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=2854c160a962d4bc956d6cc28fc98ef254cb1918 Fix an overly aggressive search-and-replace in the Makefile. --- diff --git a/Makefile b/Makefile index b575bb0..c297455 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ LIB_OBJS += sandbox_effect.o all: $(TESTS) demo # Google Test. -GDEMO_OBJS = gtest-all.o gtest_sdl_main.o +GTEST_OBJS = gtest-all.o gtest_sdl_main.o gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@ @@ -46,8 +46,8 @@ gtest_sdl_main.o: gtest_sdl_main.cpp $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@ # Unit tests. -effect_chain_test: effect_chain_test.o $(GDEMO_OBJS) libmovit.a - $(CXX) -o $@ effect_chain_test.o $(GDEMO_OBJS) libmovit.a $(LDFLAGS) +effect_chain_test: effect_chain_test.o $(GTEST_OBJS) libmovit.a + $(CXX) -o $@ effect_chain_test.o $(GTEST_OBJS) libmovit.a $(LDFLAGS) OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(GDEMO_OBJS)