Working on Makefile structure.

[flightgear.git] / Main / Makefile

diff --git a/Main/Makefile b/Main/Makefile
index f60c695f5718c99895f5978748b0b1a1fcbddc0d..08f2d02723132019039bbe4ee308756c728af15c 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -26,53 +26,22 @@
 
 TARGET=fgfs0
 
-CC = gcc
-
-# STD_FLAGS = -O2 -Wall
-STD_CFLAGS = -g -Wall
-
-
-#---------------------------------------------------------------------------
-# Define the high level GL interface library
-#---------------------------------------------------------------------------
-
-# For GLUT
-INTERFACE_FLAGS = -DGLUT
-INTERFACE_LIBS = -lglut
-INTERFACE_FILES = GLUTkey.c
-
-# For MESA_TK (Tk interface to Mesa)
-# INCLUDES = -I/usr/include/mesa
-# INTERFACE_FLAGS = -DMESA_TK
-# INTERFACE_LIBS = -L/usr/lib/mesa -lMesatk
-# INTERFACE_FILES = GLTKkey.c
-
-
-#---------------------------------------------------------------------------
-# Define main GL libraries
-#---------------------------------------------------------------------------
-
-# For OpenGL
-GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11
-
-# For Mesa
-# MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL
-# X11_LIBS =  -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11
-# GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS)
-
-
-CFLAGS = $(STD_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/ParseScn/libParseScn.a ../Scenery/libScenery.a \
+       ../Scenery/ParseVRML/libParseVRML.a ../Scenery/libScenery.a \
        ../Timer/libTimer.a
 
 
+include ../make.inc
+
+
+CFLAGS = $(FG_CFLAGS) $(INTERFACE_FLAGS)
+LIBS =  $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
+
+
 #---------------------------------------------------------------------------
 # Primary Targets
 #---------------------------------------------------------------------------
@@ -90,22 +59,35 @@ clean:
 # Secondary Targets
 #---------------------------------------------------------------------------
 
-GLmain.o: GLmain.c GLUTkey.h ../Aircraft/aircraft.h ../Scenery/scenery.h \
-       ../Timer/fg_timer.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c GLmain.c
+include depend
+
+GLmain.o:
+       $(CC) $(CFLAGS) -c GLmain.c
 
-GLUTkey.o: GLUTkey.c GLUTkey.h ../Aircraft/aircraft.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c GLUTkey.c
+GLUTkey.o:
+       $(CC) $(CFLAGS) -c GLUTkey.c
 
-GLTKkey.o: GLTKkey.c GLTKkey.h ../Aircraft/aircraft.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c GLTKkey.c
+GLTKkey.o:
+       $(CC) $(CFLAGS) -c GLTKkey.c
 
-mesh2GL.o: mesh2GL.c ../Scenery/mesh.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c mesh2GL.c
+mesh2GL.o:
+       $(CC) $(CFLAGS) -c mesh2GL.c
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.19  1997/06/27 21:38:09  curt
+# Working on Makefile structure.
+#
+# Revision 1.18  1997/06/27 20:03:36  curt
+# Working on Makefile structure.
+#
+# Revision 1.17  1997/06/26 22:14:54  curt
+# Beginning work on a scenery management system.
+#
+# 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.
 #