From 8a7e0776044c3c51255e10aaead7b2213368c5c4 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Sat, 26 Sep 2009 16:49:07 +0000
Subject: [PATCH] updated Makefile to work with externals better

git-svn-id: svn://anubis/anaglym/trunk@32 99a6e188-d820-4881-8870-2d33a10e2619
---
 Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 47a4782..b75da64 100644
--- a/Makefile
+++ b/Makefile
@@ -35,17 +35,23 @@ else
 GLLIBS     := -lGL -lGLU
 endif
 
-CPPFLAGS := $(LUAINCLUDE) $(SDLINCLUDE) $(ODEINCLUDE)
+CFLAGS   := $(LUAINCLUDE) $(SDLINCLUDE) $(ODEINCLUDE)
+CXXFLAGS := $(CFLAGS)
 LDFLAGS  := $(LUALIBS) $(ODELIBS) $(GLLIBS) $(WINDOWSLIBS) $(SDLLIBS)
 
 all: $(TARGET)
 
-$(TARGET): $(OBJS) wfobj/WFObj.o
+$(TARGET): $(OBJS) wfobj/WFObj.o OdeWorld/OdeWorld.o
 	$(CXX) -o $@ $^ $(LDFLAGS)
 
+.PHONY: wfobj/WFObj.o
 wfobj/WFObj.o:
 	$(MAKE) -C wfobj
 
+.PHONY: OdeWorld/OdeWorld.o
+OdeWorld/OdeWorld.o:
+	$(MAKE) -C OdeWorld
+
 %.o: %.c
 	$(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $<