Lots of directory layout reorganization.

diff --git a/Clipper/Makefile.am b/Clipper/Makefile.am
index 21d1948aa4ce4b5012cb850dcefd7d6cee10a0b7..f6acb6b6723d6362053fa34af29626a9ac1ff46b 100644 (file)
--- a/Clipper/Makefile.am
+++ b/Clipper/Makefile.am
@@ -5,10 +5,10 @@ libClipper_a_SOURCES = clipper.cxx clipper.hxx
 clipper_SOURCES = main.cxx
 
 clipper_LDADD = $(top_builddir)/Tools/Clipper/libClipper.a \
-       $(top_builddir)/Tools/Polygon/libPolygon.a \
+       $(top_builddir)/Tools/Lib/Polygon/libPolygon.a \
        $(top_builddir)/Lib/Debug/libDebug.a \
        $(top_builddir)/Lib/Misc/libMisc.a \
        $(top_builddir)/Lib/zlib/libz.a \
        -lgfc -lgpc
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools/Lib

diff --git a/DemInfo/Makefile.am b/DemInfo/Makefile.am
index 0b3c81ebfab669a07a03fe25b6916f2d0c7f432c..355d81593b5f13ab33163631ac8d4b17512b857d 100644 (file)
--- a/DemInfo/Makefile.am
+++ b/DemInfo/Makefile.am
@@ -30,13 +30,13 @@ deminfo_SOURCES = \
        deminfo.cxx
 
 deminfo_LDADD = \
-       $(top_builddir)/Tools/DEM/libDEM.a \
+       $(top_builddir)/Tools/Lib/DEM/libDEM.a \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Misc/libMisc.a \
        $(top_builddir)/Lib/zlib/libz.a \
        $(base_LIBS)
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools/Lib
 
 # We can't build this with "-O2" (optimization) since this causes a seg fault
 # I haven't found a way to strip this out of the CXXFLAGS, so I'm just
@@ -46,6 +46,9 @@ CXXFLAGS = -g
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.6  1999/03/08 22:00:46  curt
+# Lots of directory layout reorganization.
+#
 # Revision 1.5  1999/02/01 21:09:27  curt
 # Moving location of Lib/DEM/ to Tools/DEM/
 #

diff --git a/FixNode/Makefile.am b/FixNode/Makefile.am
index 0ec6732761747519c1c736ec7c175bd1bf00844a..68a89ed2e860b2e875c35b38904073fba2338524 100644 (file)
--- a/FixNode/Makefile.am
+++ b/FixNode/Makefile.am
@@ -31,13 +31,13 @@ fixnode_SOURCES = \
        main.cxx
 
 fixnode_LDADD = \
-       $(top_builddir)/Tools/DEM/libDEM.a \
+       $(top_builddir)/Tools/Lib/DEM/libDEM.a \
         $(top_builddir)/Lib/Bucket/libBucket.a \
         $(top_builddir)/Lib/Misc/libMisc.a \
         $(top_builddir)/Lib/zlib/libz.a \
        $(base_LIBS)
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools/Lib
 
 # We can't build this with "-O2" (optimization) since this causes a seg fault
 # I haven't found a way to strip this out of the CXXFLAGS, so I'm just
@@ -47,6 +47,9 @@ CXXFLAGS = -g
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.9  1999/03/08 22:00:45  curt
+# Lots of directory layout reorganization.
+#
 # Revision 1.8  1999/02/01 21:09:30  curt
 # Moving location of Lib/DEM/ to Tools/DEM/
 #

diff --git a/GenAirports/Makefile.am b/GenAirports/Makefile.am
index d1d6aaca53f12b113d4d9110a66e02f2465007ea..86c8ecb162e909cdd1d5ef1ccf329bd82b6c343a 100644 (file)
--- a/GenAirports/Makefile.am
+++ b/GenAirports/Makefile.am
@@ -33,18 +33,21 @@ genapts_SOURCES = \
        point2d.cxx point2d.hxx
 
 genapts_LDADD = \
-       $(top_builddir)/Tools/Polygon/libPolygon.a \
+       $(top_builddir)/Tools/Lib/Polygon/libPolygon.a \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Debug/libDebug.a \
        $(top_builddir)/Lib/Misc/libMisc.a \
        $(top_builddir)/Lib/zlib/libz.a \
        $(base_LIBS)
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools/Lib
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.6  1999/03/08 22:00:47  curt
+# Lots of directory layout reorganization.
+#
 # Revision 1.5  1999/02/25 21:32:47  curt
 # Modified to adhere to new polygon naming convention, and also to read the
 # new Robin Peel aiport format.

diff --git a/ShapeFile/Makefile.am b/ShapeFile/Makefile.am
index 6aec7fdecf358ed459590514f3b64e01871d8990..b3c41b82bc978e0a92f686034b1a32e8cdd017f2 100644 (file)
--- a/ShapeFile/Makefile.am
+++ b/ShapeFile/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = shape-decode
 shape_decode_SOURCES = main.cxx shape.cxx shape.hxx
 
 shape_decode_LDADD = \
-       $(top_builddir)/Tools/Polygon/libPolygon.a \
+       $(top_builddir)/Tools/Lib/Polygon/libPolygon.a \
        $(top_builddir)/Lib/Debug/libDebug.a \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Misc/libMisc.a \
@@ -11,4 +11,4 @@ shape_decode_LDADD = \
        -lgfc -lgpc
 
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools/Lib

diff --git a/Tools/Makefile.am b/Tools/Makefile.am
index acfddf809199b46e9bd9954ea6a3607426859b2d..c7ca1f2c1b4d807683616d65b940d6737cd6fd2d 100644 (file)
--- a/Tools/Makefile.am
+++ b/Tools/Makefile.am
@@ -1,20 +1,15 @@
 EXTRA_DIST = process-dem.pl
 
 SUBDIRS = \
-       DEM \
+       Lib \
+       Prep \
+       Utils \
        Areas \
        AssemTris \
-       DEM \
-       Polygon \
        Clipper \
        Dem2node \
-       DemInfo \
-       DemRaw2ascii \
        FixNode \
        FixObj \
-       GenAirports \
-       Makedir \
-       ShapeFile \
        SplitTris \
        Stripe_w \
        Tri2obj \