From cf78794eaff7a09e2ef0744e579fcbeb3679bd2c Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 8 Mar 1999 22:00:35 +0000 Subject: [PATCH] Lots of directory layout reorganization. --- Clipper/Makefile.am | 4 ++-- DemInfo/Makefile.am | 7 +++++-- FixNode/Makefile.am | 7 +++++-- GenAirports/Makefile.am | 7 +++++-- ShapeFile/Makefile.am | 4 ++-- Tools/Makefile.am | 11 +++-------- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Clipper/Makefile.am b/Clipper/Makefile.am index 21d1948aa..f6acb6b67 100644 --- 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 0b3c81ebf..355d81593 100644 --- 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 0ec673276..68a89ed2e 100644 --- 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 d1d6aaca5..86c8ecb16 100644 --- 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 6aec7fdec..b3c41b82b 100644 --- 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 acfddf809..c7ca1f2c1 100644 --- 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 \