From c687e7563b83c1a6e242773c8f304547cfdbe57b Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 14 Feb 2000 17:38:44 +0000 Subject: [PATCH] Restructuring directories/layout. --- Makefile.am | 6 +- VERSION | 2 +- config.log | 13 +-- config.status | 34 ++++---- configure | 112 +++++++++++++------------ configure.in | 57 ++++++------- src/Airports/GenAirports/Makefile.am | 14 ++-- src/BuildTiles/Clipper/Makefile.am | 11 ++- src/BuildTiles/GenOutput/Makefile.am | 4 +- src/BuildTiles/Main/Makefile.am | 26 +++--- src/BuildTiles/Match/Makefile.am | 5 +- src/BuildTiles/Parallel/Makefile.am | 6 +- src/BuildTiles/Triangulate/Makefile.am | 5 +- src/Include/config.h | 4 +- src/Lib/Array/Makefile.am | 8 +- src/Lib/DEM/Makefile.am | 2 +- src/Lib/Geometry/Makefile.am | 2 +- src/Lib/Optimize/Makefile.am | 5 +- src/Lib/Polygon/Makefile.am | 2 +- src/Lib/shapelib/Makefile.am | 2 +- src/Prep/DemChop/Makefile.am | 4 +- src/Prep/DemInfo/Makefile.am | 4 +- src/Prep/DemRaw2ascii/Makefile.am | 2 +- src/Prep/GSHHS/Makefile.am | 10 +-- src/Prep/MergerClipper/Makefile.am | 8 +- src/Prep/ShapeFile/Makefile.am | 8 +- 26 files changed, 169 insertions(+), 187 deletions(-) diff --git a/Makefile.am b/Makefile.am index f68d0346..ed861bf8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,3 @@ EXTRA_DIST = README README.howto scenery_version.hxx -SUBDIRS = \ - Lib \ - Prep \ - Construct \ - Utils +SUBDIRS = src \ No newline at end of file diff --git a/VERSION b/VERSION index 77d6f4ca..8acdd82b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.0 +0.0.1 diff --git a/config.log b/config.log index 1d546dc7..0fc0fb9c 100644 --- a/config.log +++ b/config.log @@ -11,15 +11,16 @@ configure:756: checking for working autoheader configure:769: checking for working makeinfo configure:784: checking whether make sets ${MAKE} configure:813: checking for gcc -configure:890: checking whether the C compiler (gcc ) works -configure:904: gcc -o conftest conftest.c 1>&5 -configure:924: checking whether the C compiler (gcc ) is a cross-compiler +configure:890: checking whether the C compiler (gcc -Wall -O2 ) works +configure:904: gcc -o conftest -Wall -O2 conftest.c 1>&5 +configure:901: warning: return-type defaults to `int' +configure:924: checking whether the C compiler (gcc -Wall -O2 ) is a cross-compiler configure:929: checking whether we are using GNU C configure:953: checking whether gcc accepts -g configure:985: checking for c++ -configure:1016: checking whether the C++ compiler (c++ ) works -configure:1030: c++ -o conftest conftest.C 1>&5 -configure:1056: checking whether the C++ compiler (c++ ) is a cross-compiler +configure:1016: checking whether the C++ compiler (c++ -Wall -O2 ) works +configure:1030: c++ -o conftest -Wall -O2 conftest.C 1>&5 +configure:1056: checking whether the C++ compiler (c++ -Wall -O2 ) is a cross-compiler configure:1061: checking whether we are using GNU C++ configure:1085: checking whether c++ accepts -g configure:1115: checking for ranlib diff --git a/config.status b/config.status index e3a1cd9c..4fe235a8 100755 --- a/config.status +++ b/config.status @@ -4,7 +4,7 @@ # This directory was configured as follows, # on host kenai: # -# ./configure --prefix=/h/curt --bindir=/h/curt/bin/Linux +# ./configure # # Compiler output produced by configure, useful for debugging # configure, is in ./config.log if it exists. @@ -14,8 +14,8 @@ for ac_option do case "$ac_option" in -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running ${CONFIG_SHELL-/bin/sh} ./configure --prefix=/h/curt --bindir=/h/curt/bin/Linux --no-create --no-recursion" - exec ${CONFIG_SHELL-/bin/sh} ./configure --prefix=/h/curt --bindir=/h/curt/bin/Linux --no-create --no-recursion ;; + echo "running ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion" + exec ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) echo "./config.status generated by autoconf version 2.12" exit 0 ;; @@ -28,23 +28,23 @@ done ac_given_srcdir=. ac_given_INSTALL="/usr/bin/install -c" -trap 'rm -fr VERSION Makefile Construct/Makefile Construct/Clipper/Makefile Construct/Combine/Makefile Construct/GenOutput/Makefile Construct/Match/Makefile Construct/Triangulate/Makefile Construct/Main/Makefile Construct/Parallel/Makefile Lib/Makefile Lib/Array/Makefile Lib/Build/Makefile Lib/DEM/Makefile Lib/Polygon/Makefile Lib/poly2tri/Makefile Lib/shapelib/Makefile Lib/Triangle/Makefile Prep/Makefile Prep/DemChop/Makefile Prep/DemInfo/Makefile Prep/DemRaw2ascii/Makefile Prep/GenAirports/Makefile Prep/GSHHS/Makefile Prep/MergerClipper/Makefile Prep/ShapeFile/Makefile Utils/Makefile Include/config.h conftest*; exit 1' 1 2 15 +trap 'rm -fr VERSION Makefile src/Makefile src/Construct/Makefile src/Construct/Clipper/Makefile src/Construct/Combine/Makefile src/Construct/GenOutput/Makefile src/Construct/Match/Makefile src/Construct/Triangulate/Makefile src/Construct/Main/Makefile src/Construct/Parallel/Makefile src/Lib/Makefile src/Lib/Array/Makefile src/Lib/Build/Makefile src/Lib/DEM/Makefile src/Lib/Polygon/Makefile src/Lib/poly2tri/Makefile src/Lib/shapelib/Makefile src/Lib/Triangle/Makefile src/Prep/Makefile src/Prep/DemChop/Makefile src/Prep/DemInfo/Makefile src/Prep/DemRaw2ascii/Makefile src/Prep/GenAirports/Makefile src/Prep/GSHHS/Makefile src/Prep/MergerClipper/Makefile src/Prep/ShapeFile/Makefile src/Utils/Makefile src/Include/config.h conftest*; exit 1' 1 2 15 # Protect against being on the right side of a sed subst in config.status. sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g; s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF /^[ ]*VPATH[ ]*=[^:]*$/d -s%@CFLAGS@%-g -O2%g +s%@CFLAGS@%-Wall -O2%g s%@CPPFLAGS@%-I/usr/local/include -I/usr/X11R6/include%g -s%@CXXFLAGS@%-g -O2%g +s%@CXXFLAGS@%-Wall -O2%g s%@DEFS@%-DHAVE_CONFIG_H%g -s%@LDFLAGS@%-L/h/curt/lib -L/usr/local/lib -L/usr/X11R6/lib%g +s%@LDFLAGS@%-L/usr/local/lib -L/usr/X11R6/lib%g s%@LIBS@%-lm %g s%@exec_prefix@%${prefix}%g -s%@prefix@%/h/curt%g +s%@prefix@%/usr/local%g s%@program_transform_name@%s,x,x,%g -s%@bindir@%/h/curt/bin/Linux%g +s%@bindir@%${exec_prefix}/bin%g s%@sbindir@%${exec_prefix}/sbin%g s%@libexecdir@%${exec_prefix}/libexec%g s%@datadir@%${prefix}/share%g @@ -60,12 +60,12 @@ s%@INSTALL_PROGRAM@%${INSTALL}%g s%@INSTALL_DATA@%${INSTALL} -m 644%g s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g s%@PACKAGE@%TerraGear%g -s%@VERSION@%0.0.0%g +s%@VERSION@%0.0.1%g s%@ACLOCAL@%aclocal%g s%@AUTOCONF@%autoconf%g s%@AUTOMAKE@%automake%g s%@AUTOHEADER@%autoheader%g -s%@MAKEINFO@%/h/curt/projects/TerraGear-0.0/src/missing makeinfo%g +s%@MAKEINFO@%/h/curt/projects/TerraGear-0.0/TerraGear/missing makeinfo%g s%@SET_MAKE@%%g s%@CC@%gcc%g s%@CXX@%c++%g @@ -117,7 +117,7 @@ if test -z "$ac_sed_cmds"; then ac_sed_cmds=cat fi -CONFIG_FILES=${CONFIG_FILES-" VERSION Makefile Construct/Makefile Construct/Clipper/Makefile Construct/Combine/Makefile Construct/GenOutput/Makefile Construct/Match/Makefile Construct/Triangulate/Makefile Construct/Main/Makefile Construct/Parallel/Makefile Lib/Makefile Lib/Array/Makefile Lib/Build/Makefile Lib/DEM/Makefile Lib/Polygon/Makefile Lib/poly2tri/Makefile Lib/shapelib/Makefile Lib/Triangle/Makefile Prep/Makefile Prep/DemChop/Makefile Prep/DemInfo/Makefile Prep/DemRaw2ascii/Makefile Prep/GenAirports/Makefile Prep/GSHHS/Makefile Prep/MergerClipper/Makefile Prep/ShapeFile/Makefile Utils/Makefile "} +CONFIG_FILES=${CONFIG_FILES-" VERSION Makefile src/Makefile src/Construct/Makefile src/Construct/Clipper/Makefile src/Construct/Combine/Makefile src/Construct/GenOutput/Makefile src/Construct/Match/Makefile src/Construct/Triangulate/Makefile src/Construct/Main/Makefile src/Construct/Parallel/Makefile src/Lib/Makefile src/Lib/Array/Makefile src/Lib/Build/Makefile src/Lib/DEM/Makefile src/Lib/Polygon/Makefile src/Lib/poly2tri/Makefile src/Lib/shapelib/Makefile src/Lib/Triangle/Makefile src/Prep/Makefile src/Prep/DemChop/Makefile src/Prep/DemInfo/Makefile src/Prep/DemRaw2ascii/Makefile src/Prep/GenAirports/Makefile src/Prep/GSHHS/Makefile src/Prep/MergerClipper/Makefile src/Prep/ShapeFile/Makefile src/Utils/Makefile "} for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in @@ -194,7 +194,7 @@ ac_eC=' ' ac_eD='%g' if test "${CONFIG_HEADERS+set}" != set; then - CONFIG_HEADERS="Include/config.h" + CONFIG_HEADERS="src/Include/config.h" fi for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". @@ -214,9 +214,9 @@ for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then ${ac_dA}PACKAGE${ac_dB}PACKAGE${ac_dC}"TerraGear"${ac_dD} ${ac_uA}PACKAGE${ac_uB}PACKAGE${ac_uC}"TerraGear"${ac_uD} ${ac_eA}PACKAGE${ac_eB}PACKAGE${ac_eC}"TerraGear"${ac_eD} -${ac_dA}VERSION${ac_dB}VERSION${ac_dC}"0.0.0"${ac_dD} -${ac_uA}VERSION${ac_uB}VERSION${ac_uC}"0.0.0"${ac_uD} -${ac_eA}VERSION${ac_eB}VERSION${ac_eC}"0.0.0"${ac_eD} +${ac_dA}VERSION${ac_dB}VERSION${ac_dC}"0.0.1"${ac_dD} +${ac_uA}VERSION${ac_uB}VERSION${ac_uC}"0.0.1"${ac_uD} +${ac_eA}VERSION${ac_eB}VERSION${ac_eC}"0.0.1"${ac_eD} ${ac_dA}HAVE_LIBM${ac_dB}HAVE_LIBM${ac_dC}1${ac_dD} ${ac_uA}HAVE_LIBM${ac_uB}HAVE_LIBM${ac_uC}1${ac_uD} ${ac_eA}HAVE_LIBM${ac_eB}HAVE_LIBM${ac_eC}1${ac_eD} @@ -436,6 +436,6 @@ fi; done -test -z "$CONFIG_HEADERS" || echo timestamp > Include/stamp-h +test -z "$CONFIG_HEADERS" || echo timestamp > src/Include/stamp-h exit 0 diff --git a/configure b/configure index 68e8f7f6..15098653 100755 --- a/configure +++ b/configure @@ -458,7 +458,7 @@ echo > confdefs.h # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=Lib/DEM/dem.cxx +ac_unique_file=src/Lib/DEM/dem.cxx # Find the source files, if location was not specified. if test -z "$srcdir"; then @@ -696,7 +696,7 @@ fi PACKAGE=TerraGear -VERSION=0.0.0 +VERSION=0.0.1 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -3948,32 +3948,33 @@ ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "\ VERSION \ Makefile \ - Construct/Makefile \ - Construct/Clipper/Makefile \ - Construct/Combine/Makefile \ - Construct/GenOutput/Makefile \ - Construct/Match/Makefile \ - Construct/Triangulate/Makefile \ - Construct/Main/Makefile \ - Construct/Parallel/Makefile \ - Lib/Makefile \ - Lib/Array/Makefile \ - Lib/Build/Makefile \ - Lib/DEM/Makefile \ - Lib/Polygon/Makefile \ - Lib/poly2tri/Makefile \ - Lib/shapelib/Makefile \ - Lib/Triangle/Makefile \ - Prep/Makefile \ - Prep/DemChop/Makefile \ - Prep/DemInfo/Makefile \ - Prep/DemRaw2ascii/Makefile \ - Prep/GenAirports/Makefile \ - Prep/GSHHS/Makefile \ - Prep/MergerClipper/Makefile \ - Prep/ShapeFile/Makefile \ - Utils/Makefile \ - Include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + src/Makefile \ + src/Construct/Makefile \ + src/Construct/Clipper/Makefile \ + src/Construct/Combine/Makefile \ + src/Construct/GenOutput/Makefile \ + src/Construct/Match/Makefile \ + src/Construct/Triangulate/Makefile \ + src/Construct/Main/Makefile \ + src/Construct/Parallel/Makefile \ + src/Lib/Makefile \ + src/Lib/Array/Makefile \ + src/Lib/Build/Makefile \ + src/Lib/DEM/Makefile \ + src/Lib/Polygon/Makefile \ + src/Lib/poly2tri/Makefile \ + src/Lib/shapelib/Makefile \ + src/Lib/Triangle/Makefile \ + src/Prep/Makefile \ + src/Prep/DemChop/Makefile \ + src/Prep/DemInfo/Makefile \ + src/Prep/DemRaw2ascii/Makefile \ + src/Prep/GenAirports/Makefile \ + src/Prep/GSHHS/Makefile \ + src/Prep/MergerClipper/Makefile \ + src/Prep/ShapeFile/Makefile \ + src/Utils/Makefile \ + src/Include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF @@ -4179,7 +4181,7 @@ ac_eD='%g' if test "${CONFIG_HEADERS+set}" != set; then EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF fi @@ -4270,7 +4272,7 @@ cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -test -z "$CONFIG_HEADERS" || echo timestamp > Include/stamp-h +test -z "$CONFIG_HEADERS" || echo timestamp > src/Include/stamp-h exit 0 EOF diff --git a/configure.in b/configure.in index 41cfefcf..cca555fd 100644 --- a/configure.in +++ b/configure.in @@ -3,10 +3,10 @@ dnl working configure script. dnl dnl $Id$ -AC_INIT(Lib/DEM/dem.cxx) +AC_INIT(src/Lib/DEM/dem.cxx) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(TerraGear, 0.0.0) +AM_INIT_AUTOMAKE(TerraGear, 0.0.1) dnl Checks for programs. AC_PROG_MAKE_SET @@ -224,36 +224,37 @@ AC_FUNC_VPRINTF AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \ random setitimer getitimer signal GetLocalTime rint getrusage ) -AM_CONFIG_HEADER(Include/config.h) +AM_CONFIG_HEADER(src/Include/config.h) AC_OUTPUT( \ VERSION \ Makefile \ - Construct/Makefile \ - Construct/Clipper/Makefile \ - Construct/Combine/Makefile \ - Construct/GenOutput/Makefile \ - Construct/Match/Makefile \ - Construct/Triangulate/Makefile \ - Construct/Main/Makefile \ - Construct/Parallel/Makefile \ - Lib/Makefile \ - Lib/Array/Makefile \ - Lib/Build/Makefile \ - Lib/DEM/Makefile \ - Lib/Polygon/Makefile \ - Lib/poly2tri/Makefile \ - Lib/shapelib/Makefile \ - Lib/Triangle/Makefile \ - Prep/Makefile \ - Prep/DemChop/Makefile \ - Prep/DemInfo/Makefile \ - Prep/DemRaw2ascii/Makefile \ - Prep/GenAirports/Makefile \ - Prep/GSHHS/Makefile \ - Prep/MergerClipper/Makefile \ - Prep/ShapeFile/Makefile \ - Utils/Makefile \ + src/Makefile \ + src/Construct/Makefile \ + src/Construct/Clipper/Makefile \ + src/Construct/Combine/Makefile \ + src/Construct/GenOutput/Makefile \ + src/Construct/Match/Makefile \ + src/Construct/Triangulate/Makefile \ + src/Construct/Main/Makefile \ + src/Construct/Parallel/Makefile \ + src/Lib/Makefile \ + src/Lib/Array/Makefile \ + src/Lib/Build/Makefile \ + src/Lib/DEM/Makefile \ + src/Lib/Polygon/Makefile \ + src/Lib/poly2tri/Makefile \ + src/Lib/shapelib/Makefile \ + src/Lib/Triangle/Makefile \ + src/Prep/Makefile \ + src/Prep/DemChop/Makefile \ + src/Prep/DemInfo/Makefile \ + src/Prep/DemRaw2ascii/Makefile \ + src/Prep/GenAirports/Makefile \ + src/Prep/GSHHS/Makefile \ + src/Prep/MergerClipper/Makefile \ + src/Prep/ShapeFile/Makefile \ + src/Utils/Makefile \ ) echo "" diff --git a/src/Airports/GenAirports/Makefile.am b/src/Airports/GenAirports/Makefile.am index 875a6161..dadc6254 100644 --- a/src/Airports/GenAirports/Makefile.am +++ b/src/Airports/GenAirports/Makefile.am @@ -33,15 +33,11 @@ genapts_SOURCES = \ runway.cxx runway.hxx genapts_LDADD = \ - $(top_builddir)/Lib/Array/libArray.a \ - $(top_builddir)/Lib/Polygon/libPolygon.a \ - $(top_builddir)/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/Lib/Build/libBuild.a \ + $(top_builddir)/src/Lib/Array/libArray.a \ + $(top_builddir)/src/Lib/Polygon/libPolygon.a \ + $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ + $(top_builddir)/src/Lib/Build/libBuild.a \ -lsgbucket -lsgdebug -lsgmath -lsgmisc -lz -lgpc \ $(base_LIBS) -INCLUDES += \ - -I$(top_builddir) \ - -I$(top_builddir)/Tools \ - -I$(top_builddir)/Lib \ - -I$(top_builddir)/Tools/Lib +INCLUDES += -I$(top_builddir) -I$(top_builddir)/src -I$(top_builddir)/src/Lib diff --git a/src/BuildTiles/Clipper/Makefile.am b/src/BuildTiles/Clipper/Makefile.am index ec60303c..dd73f1f4 100644 --- a/src/BuildTiles/Clipper/Makefile.am +++ b/src/BuildTiles/Clipper/Makefile.am @@ -7,11 +7,10 @@ noinst_PROGRAMS = testclipper testclipper_SOURCES = testclipper.cxx testclipper_LDADD = \ - $(top_builddir)/Construct/Clipper/libClipper.a \ - $(top_builddir)/Construct/Triangulate/libTriangulate.a \ - $(top_builddir)/Lib/Polygon/libPolygon.a \ - $(top_builddir)/Lib/poly2tri/libpoly2tri.a \ + $(top_builddir)/src/Construct/Clipper/libClipper.a \ + $(top_builddir)/src/Construct/Triangulate/libTriangulate.a \ + $(top_builddir)/src/Lib/Polygon/libPolygon.a \ + $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ -lsgdebug -lsgmisc -lz -lgpc -INCLUDES += -I$(top_builddir) \ - -I$(top_builddir)/Lib +INCLUDES += -I$(top_builddir)/src/Lib diff --git a/src/BuildTiles/GenOutput/Makefile.am b/src/BuildTiles/GenOutput/Makefile.am index a9577a0f..79359b28 100644 --- a/src/BuildTiles/GenOutput/Makefile.am +++ b/src/BuildTiles/GenOutput/Makefile.am @@ -4,5 +4,5 @@ libGenOutput_a_SOURCES = genobj.cxx genobj.hxx INCLUDES += \ -I$(top_builddir) \ - -I$(top_builddir)/Lib \ - -I$(top_builddir)/Construct + -I$(top_builddir)/src/Lib \ + -I$(top_builddir)/src/Construct diff --git a/src/BuildTiles/Main/Makefile.am b/src/BuildTiles/Main/Makefile.am index b5fc850f..8f78f563 100644 --- a/src/BuildTiles/Main/Makefile.am +++ b/src/BuildTiles/Main/Makefile.am @@ -5,16 +5,16 @@ fgfs_construct_SOURCES = \ main.cxx fgfs_construct_LDADD = \ - $(top_builddir)/Construct/Clipper/libClipper.a \ - $(top_builddir)/Construct/GenOutput/libGenOutput.a \ - $(top_builddir)/Construct/Combine/libCombine.a \ - $(top_builddir)/Construct/Match/libMatch.a \ - $(top_builddir)/Construct/Triangulate/libTriangulate.a \ - $(top_builddir)/Lib/Array/libArray.a \ - $(top_builddir)/Lib/Build/libBuild.a \ - $(top_builddir)/Lib/Polygon/libPolygon.a \ - $(top_builddir)/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/Lib/Triangle/libTriangle.a \ + $(top_builddir)/src/Construct/Clipper/libClipper.a \ + $(top_builddir)/src/Construct/GenOutput/libGenOutput.a \ + $(top_builddir)/src/Construct/Combine/libCombine.a \ + $(top_builddir)/src/Construct/Match/libMatch.a \ + $(top_builddir)/src/Construct/Triangulate/libTriangulate.a \ + $(top_builddir)/src/Lib/Array/libArray.a \ + $(top_builddir)/src/Lib/Build/libBuild.a \ + $(top_builddir)/src/Lib/Polygon/libPolygon.a \ + $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ + $(top_builddir)/src/Lib/Triangle/libTriangle.a \ -lsgbucket -lsgmath -lsgmisc -lsgdebug -lz -lgpc fgfs_master_SOURCES = master.cxx @@ -22,6 +22,6 @@ fgfs_master_SOURCES = master.cxx fgfs_master_LDADD = -lsgbucket -lsgmisc INCLUDES += \ - -I$(top_builddir) \ - -I$(top_builddir)/Lib \ - -I$(top_builddir)/Construct + -I$(top_builddir)/src \ + -I$(top_builddir)/src/Lib \ + -I$(top_builddir)/src/Construct diff --git a/src/BuildTiles/Match/Makefile.am b/src/BuildTiles/Match/Makefile.am index 317ce8c7..b0d8b04c 100644 --- a/src/BuildTiles/Match/Makefile.am +++ b/src/BuildTiles/Match/Makefile.am @@ -2,7 +2,4 @@ noinst_LIBRARIES = libMatch.a libMatch_a_SOURCES = match.cxx match.hxx -INCLUDES += \ - -I$(top_builddir) \ - -I$(top_builddir)/Lib \ - -I$(top_builddir)/Construct +INCLUDES += -I$(top_builddir)/src/Lib -I$(top_builddir)/src/Construct diff --git a/src/BuildTiles/Parallel/Makefile.am b/src/BuildTiles/Parallel/Makefile.am index 11779441..6cb74f18 100644 --- a/src/BuildTiles/Parallel/Makefile.am +++ b/src/BuildTiles/Parallel/Makefile.am @@ -9,6 +9,6 @@ fgfs_tools_client_SOURCES = client.cxx fgfs_tools_client_LDADD = -lsgbucket -lsgmisc INCLUDES += \ - -I$(top_builddir) \ - -I$(top_builddir)/Lib \ - -I$(top_builddir)/Construct + -I$(top_builddir)/src \ + -I$(top_builddir)/src/Lib \ + -I$(top_builddir)/src/Construct diff --git a/src/BuildTiles/Triangulate/Makefile.am b/src/BuildTiles/Triangulate/Makefile.am index 1a33eec0..d93dd5fe 100644 --- a/src/BuildTiles/Triangulate/Makefile.am +++ b/src/BuildTiles/Triangulate/Makefile.am @@ -4,7 +4,4 @@ libTriangulate_a_SOURCES = \ triangle.cxx triangle.hxx \ trieles.cxx trieles.hxx -INCLUDES += \ - -I$(top_builddir) \ - -I$(top_builddir)/Lib \ - -I$(top_builddir)/Construct +INCLUDES += -I$(top_builddir)/src/Lib -I$(top_builddir)/src/Construct diff --git a/src/Include/config.h b/src/Include/config.h index f71c69a2..68af25ba 100644 --- a/src/Include/config.h +++ b/src/Include/config.h @@ -1,4 +1,4 @@ -/* Include/config.h. Generated automatically by configure. */ +/* src/Include/config.h. Generated automatically by configure. */ /* Include/config.h.in. Generated automatically from configure.in by autoheader. */ /* Define to empty if the keyword does not work. */ @@ -67,7 +67,7 @@ /* #undef TM_IN_SYS_TIME */ /* Define to version number */ -#define VERSION "0.0.0" +#define VERSION "0.0.1" /* Define if compiling on a Winbloze (95, NT, etc.) platform */ /* #undef WIN32 */ diff --git a/src/Lib/Array/Makefile.am b/src/Lib/Array/Makefile.am index 02b49b02..e56b3cb7 100644 --- a/src/Lib/Array/Makefile.am +++ b/src/Lib/Array/Makefile.am @@ -7,11 +7,7 @@ noinst_PROGRAMS = testarray testarray_SOURCES = testarray.cxx testarray_LDADD = \ - $(top_builddir)/Lib/Array/libArray.a \ + $(top_builddir)/src/Lib/Array/libArray.a \ -lsgbucket -lsgmath -lsgmisc -lz -INCLUDES += \ - -I$(top_builddir) \ - -I$(top_builddir)/Lib \ - -I$(top_builddir)/Tools/Lib \ - -I$(top_builddir)/Tools/Construct +INCLUDES += -I$(top_builddir)/src diff --git a/src/Lib/DEM/Makefile.am b/src/Lib/DEM/Makefile.am index 91bfd90d..4262c2ce 100644 --- a/src/Lib/DEM/Makefile.am +++ b/src/Lib/DEM/Makefile.am @@ -2,7 +2,7 @@ noinst_LIBRARIES = libDEM.a libDEM_a_SOURCES = dem.cxx dem.hxx -INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib +INCLUDES += -I$(top_builddir)/src # 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 diff --git a/src/Lib/Geometry/Makefile.am b/src/Lib/Geometry/Makefile.am index c7266c5a..17acbac9 100644 --- a/src/Lib/Geometry/Makefile.am +++ b/src/Lib/Geometry/Makefile.am @@ -5,4 +5,4 @@ libBuild_a_SOURCES = \ trinodes.cxx trinodes.hxx \ trisegs.cxx trisegs.hxx -INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools/Lib +INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib diff --git a/src/Lib/Optimize/Makefile.am b/src/Lib/Optimize/Makefile.am index e039449c..187759b2 100644 --- a/src/Lib/Optimize/Makefile.am +++ b/src/Lib/Optimize/Makefile.am @@ -2,7 +2,4 @@ noinst_LIBRARIES = libCombine.a libCombine_a_SOURCES = genfans.cxx genfans.hxx -INCLUDES += \ - -I$(top_builddir) \ - -I$(top_builddir)/Lib \ - -I$(top_builddir)/Construct +INCLUDES += -I$(top_builddir)/src/Lib -I$(top_builddir)/src/Construct diff --git a/src/Lib/Polygon/Makefile.am b/src/Lib/Polygon/Makefile.am index e6bc3a04..51015c79 100644 --- a/src/Lib/Polygon/Makefile.am +++ b/src/Lib/Polygon/Makefile.am @@ -6,4 +6,4 @@ libPolygon_a_SOURCES = \ polygon.cxx polygon.hxx \ split.cxx split.hxx -INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools/Lib +INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib diff --git a/src/Lib/shapelib/Makefile.am b/src/Lib/shapelib/Makefile.am index 07805df7..ea63ff97 100644 --- a/src/Lib/shapelib/Makefile.am +++ b/src/Lib/shapelib/Makefile.am @@ -34,4 +34,4 @@ shptest_LDADD = libshape.a shputils_SOURCES = shputils.c shputils_LDADD = libshape.a -INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib +INCLUDES += -I$(top_builddir)/src diff --git a/src/Prep/DemChop/Makefile.am b/src/Prep/DemChop/Makefile.am index 6d9ca257..e7f10972 100644 --- a/src/Prep/DemChop/Makefile.am +++ b/src/Prep/DemChop/Makefile.am @@ -29,11 +29,11 @@ demchop_SOURCES = \ demchop.cxx point2d.hxx demchop_LDADD = \ - $(top_builddir)/Lib/DEM/libDEM.a \ + $(top_builddir)/src/Lib/DEM/libDEM.a \ -lsgbucket -lsgmisc -lsgdebug -lz $(base_LIBS) -INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools/Lib +INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/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 diff --git a/src/Prep/DemInfo/Makefile.am b/src/Prep/DemInfo/Makefile.am index 5643ef7f..f63bde29 100644 --- a/src/Prep/DemInfo/Makefile.am +++ b/src/Prep/DemInfo/Makefile.am @@ -29,11 +29,11 @@ deminfo_SOURCES = \ deminfo.cxx deminfo_LDADD = \ - $(top_builddir)/Lib/DEM/libDEM.a \ + $(top_builddir)/src/Lib/DEM/libDEM.a \ -lsgbucket -lsgmisc -lz \ $(base_LIBS) -INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools/Lib +INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/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 diff --git a/src/Prep/DemRaw2ascii/Makefile.am b/src/Prep/DemRaw2ascii/Makefile.am index 11593537..797e5b52 100644 --- a/src/Prep/DemRaw2ascii/Makefile.am +++ b/src/Prep/DemRaw2ascii/Makefile.am @@ -29,7 +29,7 @@ raw2ascii_SOURCES = main.c rawdem.c rawdem.h raw2ascii_LDADD = $(base_LIBS) -INCLUDES += +# INCLUDES += #--------------------------------------------------------------------------- diff --git a/src/Prep/GSHHS/Makefile.am b/src/Prep/GSHHS/Makefile.am index 35baf4d9..6d6f9eff 100644 --- a/src/Prep/GSHHS/Makefile.am +++ b/src/Prep/GSHHS/Makefile.am @@ -7,16 +7,16 @@ gshhs_SOURCES = \ simple_clip.hxx simple_clip.cxx gshhs_LDADD = \ - $(top_builddir)/Lib/Polygon/libPolygon.a \ - $(top_builddir)/Lib/poly2tri/libpoly2tri.a \ + $(top_builddir)/src/Lib/Polygon/libPolygon.a \ + $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ -lsgdebug -lsgbucket -lsgmisc -lz -lgpc debug_SOURCES = \ debug.cxx debug_LDADD = \ - $(top_builddir)/Lib/Polygon/libPolygon.a \ - $(top_builddir)/Lib/poly2tri/libpoly2tri.a \ + $(top_builddir)/src/Lib/Polygon/libPolygon.a \ + $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ -lsgdebug -lsgbucket -lsgmisc -lz -lgpc -INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools/Lib +INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib diff --git a/src/Prep/MergerClipper/Makefile.am b/src/Prep/MergerClipper/Makefile.am index 4447f0e5..292302f1 100644 --- a/src/Prep/MergerClipper/Makefile.am +++ b/src/Prep/MergerClipper/Makefile.am @@ -7,9 +7,9 @@ noinst_PROGRAMS = testmerger testmerger_SOURCES = testmerger.cxx testmerger_LDADD = \ - $(top_builddir)/Prep/MergerClipper/libMergerClipper.a \ - $(top_builddir)/Lib/Polygon/libPolygon.a \ - $(top_builddir)/Lib/poly2tri/libpoly2tri.a \ + $(top_builddir)/src/Prep/MergerClipper/libMergerClipper.a \ + $(top_builddir)/src/Lib/Polygon/libPolygon.a \ + $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ -lsgdebug -lsgbucket -lsgmisc -lz -lgpc -INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib +INCLUDES += -I$(top_builddir)/src/Lib diff --git a/src/Prep/ShapeFile/Makefile.am b/src/Prep/ShapeFile/Makefile.am index d860cd17..ab16a877 100644 --- a/src/Prep/ShapeFile/Makefile.am +++ b/src/Prep/ShapeFile/Makefile.am @@ -3,9 +3,9 @@ bin_PROGRAMS = shape-decode shape_decode_SOURCES = main.cxx shape_decode_LDADD = \ - $(top_builddir)/Lib/Polygon/libPolygon.a \ - $(top_builddir)/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/Lib/shapelib/libshape.a \ + $(top_builddir)/src/Lib/Polygon/libPolygon.a \ + $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ + $(top_builddir)/src/Lib/shapelib/libshape.a \ -lsgdebug -lsgbucket -lsgmisc -lz -lgpc -INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib +INCLUDES += -I$(top_builddir)/src/Lib