Restructuring make, adding automatic "make dep" support.

[flightgear.git] / Main / Makefile

diff --git a/Main/Makefile b/Main/Makefile
index e5e54484e4934470ca00865d031b2d7a8af056b9..a682d7a655908e5fb4cdd86ab5b4f01fb823dd99 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -24,16 +24,13 @@
 #---------------------------------------------------------------------------
 
 
-TARGET=viewer
+TARGET=fgfs0
 
 CC = gcc
 
-# STD_FLAGS = -O2 -Wall
-STD_CFLAGS = -g -Wall
-
 
 #---------------------------------------------------------------------------
-# Define the high level GL interface library
+# This is overridden in the top level Makefile, if make is run from there.
 #---------------------------------------------------------------------------
 
 # For GLUT
@@ -61,14 +58,16 @@ X11_LIBS =  -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11
 GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS)
 
 
-CFLAGS = $(STD_CFLAGS) $(INTERFACE_FLAGS)
+CFLAGS = $(FG_CFLAGS) $(INTERFACE_FLAGS)
 LIBS =  $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
 
 CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
 OFILES = $(CFILES:.c=.o)
-AFILES = ../aircraft/libaircraft.a ../controls/libcontrols.a \
-       ../flight/libflight.a ../flight/LaRCsim/libLaRCsim.a \
-       ../flight/slew/libslew.a ../mat3/libmat3.a ../scenery/libscenery.a
+AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
+       ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
+       ../Flight/Slew/libSlew.a ../mat3/libmat3.a \
+       ../Scenery/ParseScn/libParseScn.a ../Scenery/libScenery.a \
+       ../Timer/libTimer.a
 
 
 #---------------------------------------------------------------------------
@@ -80,29 +79,50 @@ $(TARGET): $(OFILES) $(AFILES)
 
 all: $(TARGET)
 
+dep:
+       $(CC) -MM *.c > depend
+
 clean:
-       rm -f *.o $(TARGET) *~ core
+       rm -f *.o $(TARGET) lib*.a *~ core
 
 
 #---------------------------------------------------------------------------
 # Secondary Targets
 #---------------------------------------------------------------------------
 
-GLmain.o: GLmain.c GLUTkey.h ../aircraft/aircraft.h ../scenery/scenery.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c GLmain.c
+include depend
 
-GLUTkey.o: GLUTkey.c GLUTkey.h ../aircraft/aircraft.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c GLUTkey.c
+GLmain.o:
+       $(CC) $(CFLAGS) -c GLmain.c
 
-GLTKkey.o: GLTKkey.c GLTKkey.h ../aircraft/aircraft.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c GLTKkey.c
+GLUTkey.o:
+       $(CC) $(CFLAGS) -c GLUTkey.c
 
-mesh2GL.o: mesh2GL.c ../scenery/mesh.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c mesh2GL.c
+GLTKkey.o:
+       $(CC) $(CFLAGS) -c GLTKkey.c
+
+mesh2GL.o:
+       $(CC) $(CFLAGS) -c mesh2GL.c
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.16  1997/06/26 19:08:33  curt
+# Restructuring make, adding automatic "make dep" support.
+#
+# Revision 1.15  1997/06/25 15:39:47  curt
+# Minor changes to compile with rsxnt/win32.
+#
+# Revision 1.14  1997/06/21 17:52:23  curt
+# Continue directory shuffling ... everything should be compilable/runnable
+# again.
+#
+# Revision 1.13  1997/06/21 17:12:54  curt
+# Capitalized subdirectory names.
+#
+# Revision 1.12  1997/06/16 19:32:51  curt
+# Starting to add general timer support.
+#
 # Revision 1.11  1997/05/31 19:16:25  curt
 # Elevator trim added.
 #