Shufflin' stuff.

[flightgear.git] / Main / Makefile

diff --git a/Main/Makefile b/Main/Makefile
index 1073ef29c4747640982101246eec4044e60ecb4f..98451a63581f778adaff891b517da0a28ce138b8 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -26,13 +26,13 @@
 
 TARGET=fg0
 
-CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
+CFILES = fg_init.c views.c $(INTERFACE_FILES)
 OFILES = $(CFILES:.c=.o)
-AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
-       ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
-       ../Flight/Slew/libSlew.a ../Math/libMath.a \
-       ../Scenery/libScenery.a \
-       ../Timer/libTimer.a ../Utils/libUtils.a
+AFILES = ../Aircraft/libAircraft.a ../Cockpit/libCockpit.a \
+       ../Controls/libControls.a ../Flight/libFlight.a \
+       ../Joystick/libJoystick.a ../Flight/LaRCsim/libLaRCsim.a \
+       ../Flight/Slew/libSlew.a ../Scenery/libScenery.a \
+       ../Time/libTime.a ../Weather/libWeather.a ../Math/libMath.a
 
 
 include ../make.inc
@@ -52,7 +52,7 @@ $(TARGET): $(OFILES) $(AFILES)
 all: $(TARGET)
 
 clean:
-       rm -f *.o $(TARGET) $(TARGET).exe lib*.a *~ core
+       rm -f *.o $(TARGET) $(TARGET).exe lib*.a *.os2 *~ core
 
 
 #---------------------------------------------------------------------------
@@ -61,21 +61,48 @@ clean:
 
 include depend
 
-GLmain.o:
-       $(CC) $(CFLAGS) -c GLmain.c
+GLUTmain.o:
+       $(CC) $(CFLAGS) -c GLUTmain.c -o $@
 
 GLUTkey.o:
-       $(CC) $(CFLAGS) -c GLUTkey.c
+       $(CC) $(CFLAGS) -c GLUTkey.c -o $@
 
 GLTKkey.o:
-       $(CC) $(CFLAGS) -c GLTKkey.c
-
-mesh2GL.o:
-       $(CC) $(CFLAGS) -c mesh2GL.c
+       $(CC) $(CFLAGS) -c GLTKkey.c -o $@
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.33  1997/09/04 02:17:35  curt
+# Shufflin' stuff.
+#
+# Revision 1.32  1997/08/27 21:31:27  curt
+# Added views.[ch]
+#
+# Revision 1.31  1997/08/25 20:27:23  curt
+# Merged in initial HUD and Joystick code.
+#
+# Revision 1.30  1997/08/22 21:34:40  curt
+# Doing a bit of reorganizing and house cleaning.
+#
+# Revision 1.29  1997/08/04 20:25:15  curt
+# Organizational tweaking.
+#
+# Revision 1.28  1997/08/02 18:45:01  curt
+# Renamed GLmain.c GLUTmain.c
+#
+# Revision 1.27  1997/07/31 22:52:39  curt
+# Working on redoing internal coordinate systems & scenery transformations.
+#
+# Revision 1.26  1997/07/30 16:12:42  curt
+# Moved fg_random routines from Util/ to Math/
+#
+# Revision 1.25  1997/07/20 02:19:11  curt
+# First stab at a system to generate os2 makefiles automatically.
+#
+# Revision 1.24  1997/07/19 23:04:47  curt
+# Added an initial weather section.
+#
 # Revision 1.23  1997/07/19 22:34:03  curt
 # Moved PI definitions to ../constants.h
 # Moved random() stuff to ../Utils/ and renamed fg_random()