Adopted Gnu automake/autoconf system.

[flightgear.git] / Tools / Makefile

diff --git a/Tools/Makefile b/Tools/Makefile
index 060bc5d22015459a6e1307e37a37310a9216082b..8c1a7750bab406aab4f05595b7b355b9fcbd2e0f 100644 (file)
--- a/Tools/Makefile
+++ b/Tools/Makefile
@@ -24,26 +24,29 @@
 #---------------------------------------------------------------------------
 
 
-include make.inc
+include $(FG_ROOT_SRC)/commondefs
 
 
-SUBDIRS = Dem2node FixNode FixObj Stripe_u Tri2obj Triangle
+LIBDIRS = DEM gpc2.01
+SUBDIRS = Areas AssemTris Dem2node DemRaw2Ascii FixNode FixObj \
+       SplitTris Stripe_u Tri2obj Triangle
+ORDEREDDIRS = $(LIBDIRS) $(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 ) ; \
+             cd $$dir; $(CC) $(CFLAGS) -M *.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,43 +54,78 @@ 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 demtools-$(VERSION).tar.gz Tools/Makefile Tools/README \
-       Tools/TODO Tools/make.inc Tools/Dem2node Tools/FixNode Tools/FixObj \
-       Tools/Stripe_u Tools/Tri2obj Tools/Triangle Tools/mesa-e.dem)
+       tar cvzf demtools-$(FG_VERSION).tar.gz Tools/Makefile Tools/README \
+       Tools/Todo Tools/make.inc Tools/process-dem.pl Tools/AssemTris \
+        Tools/DEM Tools/gpc2.01 Tools/Dem2node Tools/DemRaw2Ascii \
+       Tools/FixNode Tools/FixObj Tools/SplitTris Tools/Stripe_u \
+       Tools/Tri2obj Tools/Triangle)
 
 source-zip: clean
-       echo "need to fix this"
        (cd ..; \
-       zip -r demtools-$(VERSION).zip Tools/Makefile Tools/README \
-       Tools/TODO Tools/make.inc Tools/Dem2node Tools/FixNode Tools/FixObj \
-       Tools/Stripe_u Tools/Tri2obj Tools/Triangle Tools/mesa-e.dem)
+       zip -r demtools-$(FG_VERSION).zip Tools/Makefile Tools/README \
+       Tools/Todo Tools/make.inc Tools/process-dem.pl Tools/AssemTris \
+        Tools/DEM Tools/gpc2.01 Tools/Dem2node Tools/DemRaw2Ascii \
+       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.14  1998/04/06 21:09:37  curt
+# Additional win32 support.
+# Fixed a bad bug in dem file parsing that was causing the output to be
+# flipped about x = y.
+#
+# Revision 1.13  1998/03/19 02:52:51  curt
+# Updated to reflect some minor tool reorganization and the creation of class
+# to handle DEM processing needs.
+#
+# Revision 1.12  1998/03/19 01:48:34  curt
+# Added gpc-2.01 (generic polygon clipping library)
+#
+# Revision 1.11  1998/03/03 21:54:43  curt
+# Changes to process 30 arcsec binary DEM files.
+#
+# Revision 1.10  1998/03/03 15:36:11  curt
+# Tweaks for compiling with g++
+#
+# Revision 1.9  1998/03/03 01:21:17  curt
+# Added DemRaw2Ascii
+#
+# Revision 1.8  1998/01/31 00:41:19  curt
+# Made a few changes converting floats to doubles.
+#
+# 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.
 #