Lots of updates to get back in sync with changes made over in .../Src/

[flightgear.git] / Tools / Makefile

diff --git a/Tools/Makefile b/Tools/Makefile
index 34b2a5254527ff9f12419a8fd17da4af3e068b01..dd6f7e4dcae3084878cd13cd228a834f562ce7f0 100644 (file)
--- a/Tools/Makefile
+++ b/Tools/Makefile
@@ -24,26 +24,27 @@
 #---------------------------------------------------------------------------
 
 
-include make.inc
+include $(FG_ROOT_SRC)/commondefs
 
 
-SUBDIRS = Dem2node Tri2terrain Triangle
+SUBDIRS = AssemTris Dem2node FixNode FixObj SplitTris Stripe_u Tri2obj Triangle
+ORDEREDDIRS = $(SUBDIRS)
 
 
 all: 
-       for dir in $(SUBDIRS); do \
+       for dir in $(ORDEREDDIRS); do \
            ( cd $$dir; $(MAKE) ) ; \
        done
 
 depend:
-       for dir in $(SUBDIRS); do \
+       for dir in $(ORDEREDDIRS); do \
            ( echo "Making depend in $$dir"; \
              cd $$dir; $(CC) -MM *.c > depend ) ; \
        done
 
 Makefile-os2:
        cat Makefile | perl mkmfos2.pl > Makefile.os2; \
-       for dir in $(SUBDIRS); 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) ; \
@@ -51,41 +52,62 @@ Makefile-os2:
 
 clean:
        -rm -f *.os2 *~
-       for dir in $(SUBDIRS); do \
+       for dir in $(ORDEREDDIRS); do \
            (cd $$dir; $(MAKE) clean) ; \
        done
 
 
 source-tar: clean
-       echo "need to fix this"
-#      (cd ../..; \
-#      tar cvzf source-$(VERSION).tar.gz FlightGear/fgtop FlightGear/COPYING \
-#      FlightGear/Docs FlightGear/Src FlightGear/Thanks)
+       (cd ..; \
+       tar cvzf demtools-$(FG_VERSION).tar.gz Tools/Makefile Tools/README \
+       Tools/Todo Tools/make.inc Tools/AssemTris Tools/Dem2node \
+       Tools/FixNode Tools/FixObj Tools/SplitTris Tools/Stripe_u \
+       Tools/Tri2obj Tools/Triangle)
 
 source-zip: clean
-       echo "need to fix this"
-#      (cd ../..; \
-#      zip -r source-$(VERSION).zip FlightGear/fgtop FlightGear/COPYING \
-#      FlightGear/Docs FlightGear/Src FlightGear/Thanks)
+       (cd ..; \
+       zip -r demtools-$(FG_VERSION).zip Tools/Makefile Tools/README \
+       Tools/Todo Tools/make.inc Tools/AssemTris Tools/Dem2node \
+       Tools/FixNode Tools/FixObj Tools/SplitTris Tools/Stripe_u \
+       Tools/Tri2obj Tools/Triangle)
 
 bin-tar: all
        echo "need to fix this"
 #      cp GLUT/fg0 GLUT/runfg ..
 #      (cd ../..; \
-#      tar cvzf bin-$(VERSION).tar.gz FlightGear/fgtop FlightGear/fg0 \
+#      tar cvzf bin-$(FG_VERSION).tar.gz FlightGear/fgtop FlightGear/fg0 \
 #      FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/Thanks)
 
 bin-zip: 
        echo "need to fix this"
 #      cp GLUT/fg0.exe GLUT/runfg.bat GLUT/cygwin.dll ..
 #      (cd ../..; \
-#      zip -r bin-$(VERSION).zip FlightGear/fgtop FlightGear/fg0.exe \
+#      zip -r bin-$(FG_VERSION).zip FlightGear/fgtop FlightGear/fg0.exe \
 #      FlightGear/runfg.bat FlightGear/cygwin.dll FlightGear/COPYING \
 #      FlightGear/Docs FlightGear/Thanks)
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.7  1998/01/27 18:36:53  curt
+# Lots of updates to get back in sync with changes made over in .../Src/
+#
+# Revision 1.6  1998/01/21 02:55:42  curt
+# Incorporated new make system from Bob Kuehne <rpk@sgi.com>.
+#
+# Revision 1.5  1998/01/14 15:55:34  curt
+# Finished splittris, started assemtris.
+#
+# Revision 1.4  1997/12/10 01:18:25  curt
+# Initial revision.
+#
+# Revision 1.3  1997/11/27 00:18:26  curt
+# Added FixNode
+#
+# Revision 1.2  1997/11/14 00:31:06  curt
+# Abandon Tri2terrain ... replace with Tri2obj so we can use an existing
+# tri-stripper.
+#
 # Revision 1.1  1997/10/20 19:52:18  curt
 # Initial revision.
 #