Removed "depend" files from cvs control. Other minor make tweaks.

[flightgear.git] / Simulator / Makefile

diff --git a/Simulator/Makefile b/Simulator/Makefile
index bf25cafb38d68a296c9be8aa5d59693be27fe136..e8836288d800194dc2ae17751c1ead4bc726dc07 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -24,29 +24,28 @@
 #---------------------------------------------------------------------------
 
 
-include make.inc
-
+include $(FG_ROOT_SRC)/commondefs
 
 SUBSUBDIRS = Flight/LaRCsim Flight/Slew
 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) -M *.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) ; \
@@ -54,31 +53,37 @@ 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) clobber) ; \
+       done
 
 source-tar: clean
        (cd ../..; \
        $(TAR) cvzf source-$(FG_VERSION).tar.gz FlightGear/fgtop \
-       FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Thanks)
+       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)
+       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/*.dat \
+       FlightGear/Scenery/*/*/*.obj)
 
 scenery-zip:
        (cd ../..; \
-       zip -r scenery-$(FG_VERSION).zip FlightGear/Scenery)
+       zip -r scenery-$(FG_VERSION).zip FlightGear/Scenery/*.dat \
+       FlightGear/Scenery/*/*/*.obj)
 
 bin-tar: all
-       cp Main/fg-$(FG_VERSION) README runfg ..
+       cp Main/fg-$(FG_VERSION) README Thanks runfg ..
        $(RM) -f ../fg$(FG_VERSION_MAJOR)
        $(LN) ../fg-$(FG_VERSION) ../fg$(FG_VERSION_MAJOR)
        (cd ../..; \
@@ -88,7 +93,8 @@ bin-tar: all
        FlightGear/Thanks)
 
 bin-zip: 
-       cp Main/fg$(FG_VERSION_MAJOR).exe Main/cygwin.dll README 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 \
@@ -98,6 +104,26 @@ bin-zip:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.41  1998/02/09 22:56:28  curt
+# Removed "depend" files from cvs control.  Other minor make tweaks.
+#
+# Revision 1.40  1998/02/01 03:39:53  curt
+# Minor tweaks.
+#
+# 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 ...
 #