fly/terragear
1
0
Fork 0
Code Activity

Restructuring directories/layout.

Browse source
This commit is contained in:
curt 2000-02-14 17:38:44 +00:00
parent 71927623cd
commit c687e7563b
26 changed files with 169 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.am
View file

@ -1,7 +1,3 @@
EXTRA_DIST = README README.howto scenery_version.hxx
SUBDIRS = \
Lib \
Prep \
Construct \
Utils
SUBDIRS = src

2
VERSION
View file

@ -1 +1 @@
0.0.0
0.0.1

13
config.log
View file

@ -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

34
config.status
View file

@ -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

112
configure vendored
View file

@ -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 <<EOF
@ -4073,31 +4074,32 @@ cat >> $CONFIG_STATUS <<EOF
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 \
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 \
"}
EOF
cat >> $CONFIG_STATUS <<\EOF
@ -4179,7 +4181,7 @@ ac_eD='%g'
if test "${CONFIG_HEADERS+set}" != set; then
EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_HEADERS="Include/config.h"
CONFIG_HEADERS="src/Include/config.h"
EOF
cat >> $CONFIG_STATUS <<\EOF
fi
@ -4270,7 +4272,7 @@ cat >> $CONFIG_STATUS <<EOF
EOF
cat >> $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

57
configure.in
View file

@ -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 ""

14
src/Airports/GenAirports/Makefile.am
View file

@ -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

11
src/BuildTiles/Clipper/Makefile.am
View file

@ -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

4
src/BuildTiles/GenOutput/Makefile.am
View file

@ -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

26
src/BuildTiles/Main/Makefile.am
View file

@ -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

5
src/BuildTiles/Match/Makefile.am
View file

@ -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

6
src/BuildTiles/Parallel/Makefile.am
View file

@ -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

5
src/BuildTiles/Triangulate/Makefile.am
View file

@ -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

4
src/Include/config.h
View file

@ -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 */

8
src/Lib/Array/Makefile.am
View file

@ -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

2
src/Lib/DEM/Makefile.am
View file

@ -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

2
src/Lib/Geometry/Makefile.am
View file

@ -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

5
src/Lib/Optimize/Makefile.am
View file

@ -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

2
src/Lib/Polygon/Makefile.am
View file

@ -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

2
src/Lib/shapelib/Makefile.am
View file

@ -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

4
src/Prep/DemChop/Makefile.am
View file

@ -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

4
src/Prep/DemInfo/Makefile.am
View file

@ -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

2
src/Prep/DemRaw2ascii/Makefile.am
View file

@ -29,7 +29,7 @@ raw2ascii_SOURCES = main.c rawdem.c rawdem.h
raw2ascii_LDADD = $(base_LIBS)
INCLUDES +=
# INCLUDES +=
#---------------------------------------------------------------------------

10
src/Prep/GSHHS/Makefile.am
View file

@ -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

8
src/Prep/MergerClipper/Makefile.am
View file

@ -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

8
src/Prep/ShapeFile/Makefile.am
View file

@ -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