More misc. tweaks for rpk make merge.

[flightgear.git] / Simulator / Makefile

diff --git a/Simulator/Makefile b/Simulator/Makefile
index 676c7c1b44a83523dd66511d4b9ebbd2efb4ee70..de0de65227623a01bb9b1481b59180149f6b49e2 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -23,29 +23,28 @@
 # (Log is kept at end of this file)
 #---------------------------------------------------------------------------
 
-
-include make.inc
-
+include $(FG_ROOT_SRC)/commondefs
 
 SUBSUBDIRS = Flight/LaRCsim Flight/Slew
-SUBDIRS = Aircraft Controls Flight Math Scenery Timer Utils Weather
-MAIN = OpenGL
-
+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,24 +52,107 @@ 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: clean
+source-zip: clean
        (cd ../..; \
-       tar cvf prototype-$(VERSION).tar FlightGear/COPYING FlightGear/Docs \
-       FlightGear/Src FlightGear/Thanks)
+       zip -r source-$(FG_VERSION).zip FlightGear/fgtop \
+       FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Thanks)
 
-zip: clean
+scenery-tar:
        (cd ../..; \
-       zip -r prototype-$(VERSION).zip FlightGear/COPYING FlightGear/Docs \
-       FlightGear/Src FlightGear/Thanks)
+       $(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) README 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 \
+       FlightGear/fg-$(FG_VERSION) FlightGear/fg$(FG_VERSION_MAJOR) \
+       FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/README \
+       FlightGear/Thanks)
+
+bin-zip: 
+       cp Main/fg$(FG_VERSION_MAJOR).exe Main/cygwin.dll README 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/README FlightGear/Thanks)
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# 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.
+#
+# Revision 1.30  1997/12/10 01:19:42  curt
+# Tweaks for verion 0.15 release.
+#
+# Revision 1.29  1997/10/30 12:38:35  curt
+# Working on new scenery subsystem.
+#
+# Revision 1.28  1997/10/28 19:35:40  curt
+# Organizational changes.
+#
+# Revision 1.27  1997/09/23 00:29:27  curt
+# Tweaks to get things to compile with gcc-win32.
+#
+# Revision 1.26  1997/09/04 02:17:18  curt
+# Shufflin' stuff.
+#
+# Revision 1.25  1997/08/25 20:27:21  curt
+# Merged in initial HUD and Joystick code.
+#
+# Revision 1.24  1997/08/16 12:22:17  curt
+# Tweaks for new version.
+#
+# Revision 1.23  1997/08/13 20:22:55  curt
+# Renamed OpenGL/ to GLUT/
+#
+# Revision 1.22  1997/07/31 22:52:21  curt
+# Working on redoing internal coordinate systems & scenery transformations.
+#
+# Revision 1.21  1997/07/30 16:12:38  curt
+# Moved fg_random routines from Util/ to Math/
+#
 # Revision 1.20  1997/07/20 02:19:09  curt
 # First stab at a system to generate os2 makefiles automatically.
 #