1
0
Fork 0

Various reshufflings of directory layout.

This commit is contained in:
curt 2001-04-25 18:55:19 +00:00
parent 587763000e
commit 483708977a
13 changed files with 30 additions and 29 deletions

View file

@ -102,7 +102,7 @@ corresponding files puting hydro data in the directory work.hydro and
urban data in the directory work.urban.
As Curtis changed the directory structure in the last CVS versions you
have to look in Construct/Main/main.cxx first and modify the directory
have to look in BuildTiles/Main/main.cxx first and modify the directory
names accordingly. (FE 30 arc-sec files should be in work_base/DEM-30/
Now we finished with data preparation and we can start generating

View file

@ -295,14 +295,16 @@ AC_OUTPUT( \
Makefile \
src/Makefile \
src/Include/Makefile \
src/Construct/Makefile \
src/Construct/Clipper/Makefile \
src/Construct/GenOutput/Makefile \
src/Construct/Match/Makefile \
src/Construct/Triangulate/Makefile \
src/Construct/Main/Makefile \
src/Construct/Osgb36/Makefile \
src/Construct/Parallel/Makefile \
src/Airports/Makefile \
src/Airports/GenAirports/Makefile \
src/BuildTiles/Makefile \
src/BuildTiles/Clipper/Makefile \
src/BuildTiles/GenOutput/Makefile \
src/BuildTiles/Match/Makefile \
src/BuildTiles/Triangulate/Makefile \
src/BuildTiles/Main/Makefile \
src/BuildTiles/Osgb36/Makefile \
src/BuildTiles/Parallel/Makefile \
src/Lib/Makefile \
src/Lib/Array/Makefile \
src/Lib/DEM/Makefile \
@ -320,7 +322,6 @@ AC_OUTPUT( \
src/Prep/DemInfo/Makefile \
src/Prep/DemRaw2ascii/Makefile \
src/Prep/E00Lines/Makefile \
src/Prep/GenAirports/Makefile \
src/Prep/GSHHS/Makefile \
src/Prep/MergerClipper/Makefile \
src/Prep/ShapeFile/Makefile \

View file

@ -47,4 +47,4 @@ INCLUDES += \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/Lib \
-I$(top_srcdir)/src/Construct
-I$(top_srcdir)/src/BuildTiles

View file

@ -7,12 +7,12 @@ noinst_PROGRAMS = testclipper
testclipper_SOURCES = testclipper.cxx
testclipper_LDADD = \
$(top_builddir)/src/Construct/Clipper/libClipper.a \
$(top_builddir)/src/Construct/Osgb36/libOsgb36.a \
$(top_builddir)/src/Construct/Triangulate/libTriangulate.a \
$(top_builddir)/src/BuildTiles/Clipper/libClipper.a \
$(top_builddir)/src/BuildTiles/Osgb36/libOsgb36.a \
$(top_builddir)/src/BuildTiles/Triangulate/libTriangulate.a \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/landcover/liblandcover.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgbucket -lsgdebug -lsgmisc -lz -lgpc
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/Construct
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles

View file

@ -5,4 +5,4 @@ libGenOutput_a_SOURCES = genobj.cxx genobj.hxx
INCLUDES += \
-I$(top_srcdir) \
-I$(top_srcdir)/src/Lib \
-I$(top_srcdir)/src/Construct
-I$(top_srcdir)/src/BuildTiles

View file

@ -5,11 +5,11 @@ fgfs_construct_SOURCES = \
main.cxx
fgfs_construct_LDADD = \
$(top_builddir)/src/Construct/Clipper/libClipper.a \
$(top_builddir)/src/Construct/GenOutput/libGenOutput.a \
$(top_builddir)/src/Construct/Match/libMatch.a \
$(top_builddir)/src/Construct/Osgb36/libOsgb36.a \
$(top_builddir)/src/Construct/Triangulate/libTriangulate.a \
$(top_builddir)/src/BuildTiles/Clipper/libClipper.a \
$(top_builddir)/src/BuildTiles/GenOutput/libGenOutput.a \
$(top_builddir)/src/BuildTiles/Match/libMatch.a \
$(top_builddir)/src/BuildTiles/Osgb36/libOsgb36.a \
$(top_builddir)/src/BuildTiles/Triangulate/libTriangulate.a \
$(top_builddir)/src/Lib/Array/libArray.a \
$(top_builddir)/src/Lib/Geometry/libGeometry.a \
$(top_builddir)/src/Lib/Optimize/libOptimize.a \
@ -26,4 +26,4 @@ fgfs_master_LDADD = -lsgbucket -lsgmisc
INCLUDES += \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/Lib \
-I$(top_srcdir)/src/Construct
-I$(top_srcdir)/src/BuildTiles

View file

@ -2,4 +2,4 @@ noinst_LIBRARIES = libMatch.a
libMatch_a_SOURCES = match.cxx match.hxx
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/Construct
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles

View file

@ -13,4 +13,4 @@ fgfs_tools_client_LDADD = -lsgbucket -lsgmisc
INCLUDES += \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/Lib \
-I$(top_srcdir)/src/Construct
-I$(top_srcdir)/src/BuildTiles

View file

@ -4,4 +4,4 @@ libTriangulate_a_SOURCES = \
triangle.cxx triangle.hxx \
trieles.cxx trieles.hxx
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/Construct
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles

View file

@ -9,4 +9,4 @@ libGeometry_a_SOURCES = \
INCLUDES += \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/Lib \
-I$(top_srcdir)/src/Construct
-I$(top_srcdir)/src/BuildTiles

View file

@ -4,4 +4,4 @@ libOptimize_a_SOURCES = \
genfans.cxx genfans.hxx \
genstrips.cxx genstrips.hxx
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/Construct
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles

View file

@ -2,5 +2,6 @@ SUBDIRS = \
Include \
Lib \
Prep \
Construct \
Airports \
BuildTiles \
Utils

View file

@ -3,7 +3,6 @@ SUBDIRS = \
DemInfo \
DemRaw2ascii \
E00Lines \
GenAirports \
GSHHS \
MergerClipper \
ShapeFile