Small Makefile cleanup to prepare for more files.

[movit] / Makefile

diff --git a/Makefile b/Makefile
index 5695c2eeef0428cd76460a64ead5d6b9cb76e4df..deaf0663ac658efade94db1ddd1ab152debf75d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
 CC=gcc
 CXX=g++
-CFLAGS=-std=gnu99 -Wall
+CXXFLAGS=-Wall
 LDFLAGS=-lSDL -lSDL_image -lGL
+OBJS=test.o util.o
 
-test: test.o
-       $(CXX) -o test test.o $(LDFLAGS)
+test: $(OBJS)
+       $(CXX) -o test $(OBJS) $(LDFLAGS)
 
 .o: .cpp
-       $(CXX) $(CXXFLAGS) $(CCFLAGS) -o $@ $<
+       $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
 
 clean:
-       $(RM) test test.o
+       $(RM) test $(OBJS)
 
 .PHONY: clean