Changed: Made the makefiles a bit more proper

~g2k

Makefile

@@ -1,11 +1,22 @@
-
+EXECUTABLES = OpenArena/OA
+LIBRARIES = 
+BUILDROOT = /usr/local
+PREFIX = 
 
 .Phony: all clean install
 
 all:
+	$(MAKE) -C src all
 	
 clean: 
+	$(MAKE) -C src clean
 
 install:
 	
+install-devel:
+	
+install-doc:
+	
+
+
 

src/Makefile

@@ -1,8 +1,9 @@
+#Dependencies soooo need to be fixed/finished
 CPP = g++ -g
 INCLUDES = 
 LD = g++
 INCLUDEPATH = ../include
-OBJECTS = bmp.o camera.o ctrls.o level.o mygl.o myglFont.o myglTexture.o physics.o player.o strmanip.o tga.o vector.o window.o main.o
+OBJECTS = bmp.o camera.o ctrls.o level.o mygl.o myglFont.o myglTexture.o physics.o player.o strmanip.o tga.o vector.o window.o keys.o main.o
 LIBS = -L/usr/X11R6/lib -lGL -lGLU -lXxf86vm
 LIBRARIES = 
 SO_LIBS = 
@@ -33,23 +34,12 @@ oa_video.so:
 
 oa_input.so:
 
-#Add something like this
+bmp.o: bmp.cpp $(INCLUDEPATH)/bmp.h $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/datatypes.h $(INCLUDEPATH)/texture.h
-#$(INCLUDEPATH)/bmp.h: mygl.h datatypes.h texture.h
-#	touch bmp.h
-
-bmp.o: bmp.cpp $(INCLUDEPATH)/bmp.h 
 	$(CPP) -c -o bmp.o bmp.cpp
 	
-$(INCLUDEPATH)/bmp.h: $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/datatypes.h $(INCLUDEPATH)/texture.h
+camera.o: camera.cpp $(INCLUDEPATH)/camera.h $(INCLUDEPATH)/vector.h $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/screen.h
-	touch $(INCLUDEPATH)/bmp.h
-	
-#$(INCLUDEPATH)/mygl.h: $(INCLUDEPATH)/datatypes.h 
-	
-camera.o: camera.cpp $(INCLUDEPATH)/camera.h
 	$(CPP) -c -o camera.o camera.cpp
 
-#$(INCLUDEPATH)/camera.h
-	
 ctrls.o: ctrls.cpp $(INCLUDEPATH)/ctrls.h 
 	$(CPP) -c -o ctrls.o ctrls.cpp
 
@@ -86,5 +76,8 @@ vector.o: vector.cpp $(INCLUDEPATH)/vector.h
 window.o: window.cpp $(INCLUDEPATH)/window.h
 	$(CPP) -c -o window.o window.cpp
 	
+keys.o: keys.cpp $(INCLUDEPATH)/keys.h
+	$(CPP) -c -o keys.o keys.cpp
+
 main.o: linux.cpp $(INCLUDEPATH)/main.h
 	$(CPP) -c -o main.o linux.cpp