Yet more Makefile tweaks/fixes.

[movit] / Makefile

diff --git a/Makefile b/Makefile
index 0ebb8841098b3e956011b012dfce2cd2b71b044d..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
@@ -47,9 +47,11 @@ gtest_sdl_main.o: gtest_sdl_main.cpp
 
 # Unit tests.
 effect_chain_test: effect_chain_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ effect_chain_test.o $(TEST_OBJS) libmovit.a $(LDFLAGS)
+       $(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)