Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message

[flightgear.git] / Simulator / Makefile

diff --git a/Simulator/Makefile b/Simulator/Makefile
index 412a54ba736ba4a4c6adc5336bfd39c24cd557b4..0067d2ea98338718e2503c3b02f90eddb952371f 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -24,28 +24,28 @@
 #---------------------------------------------------------------------------
 
 
-include make.inc
-
+include $(FG_ROOT_SRC)/commondefs
 
 SUBSUBDIRS = Flight/LaRCsim Flight/Slew
-SUBDIRS = Aircraft Cockpit Controls Flight Joystick Math Scenery Time Weather
+SUBDIRS = Aircraft Astro Cockpit Controls Flight Joystick Math Scenery \
+       Time Weather XGL
 MAIN = Main
-
+ORDEREDDIRS = $(SUBSUBDIRS) $(SUBDIRS) $(MAIN)
 
 all: 
-       for dir in $(SUBSUBDIRS) $(SUBDIRS) $(MAIN); do \
+       for dir in $(ORDEREDDIRS); do \
            ( cd $$dir; $(MAKE) ) ; \
        done
 
 depend:
-       for dir in $(SUBSUBDIRS) $(SUBDIRS) $(MAIN); do \
+       for dir in $(ORDEREDDIRS); do \
            ( echo "Making depend in $$dir"; \
-             cd $$dir; $(CC) -MM *.c > depend ) ; \
+             cd $$dir; $(CC) $(CFLAGS) -MM *.c > depend ) ; \
        done
 
 Makefile-os2:
        cat Makefile | perl mkmfos2.pl > Makefile.os2; \
-       for dir in $(SUBSUBDIRS) $(SUBDIRS) $(MAIN); do \
+       for dir in $(ORDEREDDIRS); do \
            ( echo "Making Makefile.os2 in $$dir"; \
              cat $$dir/Makefile | perl mkmfos2.pl > $$dir/Makefile.os2; \
              cat $$dir/depend   | perl mkmfos2.pl > $$dir/depend.os2) ; \
@@ -53,48 +53,82 @@ Makefile-os2:
 
 clean:
        -rm -f *.os2 *~
-       for dir in $(SUBSUBDIRS) $(SUBDIRS) $(MAIN); do \
+       for dir in $(ORDEREDDIRS); do \
            (cd $$dir; $(MAKE) clean) ; \
        done
 
+clobber:
+       for dir in $(ORDEREDDIRS); do \
+           (cd $$dir; $(MAKE) clean) ; \
+       done
 
 source-tar: clean
        (cd ../..; \
-       tar cvzf source-$(FG_VERSION).tar.gz FlightGear/fgtop \
-       FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Thanks)
+       $(TAR) cvzf source-$(FG_VERSION).tar.gz FlightGear/fgtop \
+       FlightGear/COPYING FlightGear/Docs FlightGear/Src)
 
 source-zip: clean
        (cd ../..; \
-       zip -r source-$(FG_VERSION).zip FlightGear/fgtop 
-       FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Thanks)
+       zip -r source-$(FG_VERSION).zip FlightGear/fgtop \
+       FlightGear/COPYING FlightGear/Docs FlightGear/Src)
 
 scenery-tar:
        (cd ../..; \
-       tar cvzf scenery-$(FG_VERSION).tar.gz FlightGear/Scenery)
+       $(TAR) cvzf scenery-$(FG_VERSION).tar.gz FlightGear/Scenery)
 
 scenery-zip:
        (cd ../..; \
        zip -r scenery-$(FG_VERSION).zip FlightGear/Scenery)
 
 bin-tar: all
-       cp Main/fg-$(FG_VERSION) runfg ..
+       cp Main/fg-$(FG_VERSION) README Thanks runfg ..
+       $(RM) -f ../fg$(FG_VERSION_MAJOR)
        $(LN) ../fg-$(FG_VERSION) ../fg$(FG_VERSION_MAJOR)
        (cd ../..; \
-       tar cvzf bin-$(FG_VERSION).tar.gz FlightGear/fgtop \
+       $(TAR) cvzf bin-$(FG_VERSION).tar.gz FlightGear/fgtop \
        FlightGear/fg-$(FG_VERSION) FlightGear/fg$(FG_VERSION_MAJOR) \
-       FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/Thanks)
+       FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/README \
+       FlightGear/Thanks)
 
 bin-zip: 
-       cp Main/fg$(FG_VERSION_MAJOR).exe Main/cygwin.dll runfg.bat ..
+       cp Main/fg$(FG_VERSION_MAJOR).exe Main/cygwin.dll README Thanks \
+       runfg.bat ..
        (cd ../..; \
        zip -r bin-$(FG_VERSION).zip FlightGear/fgtop \
        FlightGear/fg$(FG_VERSION_MAJOR).exe FlightGear/runfg.bat \
        FlightGear/cygwin.dll FlightGear/COPYING FlightGear/Docs \
-       FlightGear/Thanks)
+       FlightGear/README FlightGear/Thanks)
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.39  1998/01/27 00:47:41  curt
+# Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+# system and commandline/config file processing code.
+#
+# Revision 1.38  1998/01/22 22:03:22  curt
+# Tweaks.
+#
+# Revision 1.37  1998/01/19 19:42:58  curt
+# More misc. tweaks for rpk make merge.
+#
+# Revision 1.36  1998/01/19 19:26:51  curt
+# Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+# This should simplify things tremendously.
+#
+# Revision 1.35  1998/01/07 03:18:14  curt
+# Created the Astro/ subdirctory for stuff high in the sky ...
+#
+# Revision 1.34  1997/12/18 23:32:28  curt
+# First stab at sky dome actually starting to look reasonable. :-)
+#
+# Revision 1.33  1997/12/17 23:13:17  curt
+# Changes and tweaks to go to version 0.19 (Plus tweaks to Solaris support)
+#
+# Revision 1.32  1997/12/15 23:54:25  curt
+# Add xgl wrappers for debugging.
+# Generate terrain normals on the fly.
+#
 # Revision 1.31  1997/12/15 20:59:08  curt
 # Misc. tweaks.
 #