Yet more Makefile tweaks/fixes.

[movit] / Makefile

diff --git a/Makefile b/Makefile
index b575bb02814cf5795fa313c8e04c0eab22f0f7cd..aaa9896ec36294e3c4a22d96a1190813e084f576 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ LDFLAGS=-lSDL -lSDL_image -lGL -lrt -lpthread
 RANLIB=ranlib
 
 DEMO_OBJS=demo.o
-TESTS=effect_chain_test
+TESTS=effect_chain_test mix_effect_test
 
 # Core.
 LIB_OBJS=util.o widgets.o effect.o effect_chain.o
@@ -37,8 +37,8 @@ LIB_OBJS += sandbox_effect.o
 # Default target:
 all: $(TESTS) demo
 
-# Google Test.
-GDEMO_OBJS = gtest-all.o gtest_sdl_main.o
+# Google Test and other test library functions.
+TEST_OBJS = gtest-all.o gtest_sdl_main.o test_util.o
 
 gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc
        $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@
@@ -46,10 +46,12 @@ 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 $(TEST_OBJS) libmovit.a
+       $(CXX) -o $@ $^ $(LDFLAGS)
+mix_effect_test: mix_effect_test.o $(TEST_OBJS) libmovit.a
+       $(CXX) -o $@ $^ $(LDFLAGS)
 
-OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(GDEMO_OBJS)
+OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
 
 # A small demo program.
 demo: libmovit.a $(DEMO_OBJS)