From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 12 Oct 2012 16:58:20 +0000 (+0200)
Subject: Yet more Makefile tweaks/fixes.
X-Git-Tag: 1.0~308
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=927e131593a58bea69ae5e742aa5a1657082c9f1;ds=sidebyside

Yet more Makefile tweaks/fixes.
---

diff --git a/Makefile b/Makefile
index 69e9ef4..aaa9896 100644
--- a/Makefile
+++ b/Makefile
@@ -47,11 +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 $@ mix_effect_test.o $(TEST_OBJS) libmovit.a $(LDFLAGS)
+	$(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)