fly/terragear
1
0
Fork 0
Code Activity

Changed builddir -> srcdir for out of source tree builds.

Browse source
This commit is contained in:
curt 2000-09-20 21:45:25 +00:00
parent 79d86a25ac
commit 1f57a4bd06
17 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,4 +13,4 @@ testclipper_LDADD = \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgdebug -lsgmisc -lz -lgpc -lsgdebug -lsgmisc -lz -lgpc
INCLUDES += -I$(top_builddir)/src/Lib INCLUDES += -I$(top_srcdir)/src/Lib

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

@ -3,6 +3,6 @@ noinst_LIBRARIES = libGenOutput.a
libGenOutput_a_SOURCES = genobj.cxx genobj.hxx libGenOutput_a_SOURCES = genobj.cxx genobj.hxx
INCLUDES += \ INCLUDES += \
-I$(top_builddir) \ -I$(top_srcdir) \
-I$(top_builddir)/src/Lib \ -I$(top_srcdir)/src/Lib \
-I$(top_builddir)/src/Construct -I$(top_srcdir)/src/Construct

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

@ -22,6 +22,6 @@ fgfs_master_SOURCES = master.cxx
fgfs_master_LDADD = -lsgbucket -lsgmisc fgfs_master_LDADD = -lsgbucket -lsgmisc
INCLUDES += \ INCLUDES += \
-I$(top_builddir)/src \ -I$(top_srcdir)/src \
-I$(top_builddir)/src/Lib \ -I$(top_srcdir)/src/Lib \
-I$(top_builddir)/src/Construct -I$(top_srcdir)/src/Construct

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

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

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

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

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

@ -10,4 +10,4 @@ testarray_LDADD = \
$(top_builddir)/src/Lib/Array/libArray.a \ $(top_builddir)/src/Lib/Array/libArray.a \
-lsgbucket -lsgmath -lsgmisc -lz -lsgbucket -lsgmath -lsgmisc -lz
INCLUDES += -I$(top_builddir)/src INCLUDES += -I$(top_srcdir)/src

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

@ -2,10 +2,5 @@ noinst_LIBRARIES = libDEM.a
libDEM_a_SOURCES = dem.cxx dem.hxx libDEM_a_SOURCES = dem.cxx dem.hxx
INCLUDES += -I$(top_builddir)/src INCLUDES += -I$(top_srcdir)/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
# setting it to "-g"
# CXXFLAGS = -g

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

@ -7,6 +7,6 @@ libGeometry_a_SOURCES = \
trisegs.cxx trisegs.hxx trisegs.cxx trisegs.hxx
INCLUDES += \ INCLUDES += \
-I$(top_builddir)/src \ -I$(top_srcdir)/src \
-I$(top_builddir)/src/Lib \ -I$(top_srcdir)/src/Lib \
-I$(top_builddir)/src/Construct -I$(top_srcdir)/src/Construct

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

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

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

@ -7,4 +7,4 @@ libPolygon_a_SOURCES = \
split.cxx split.hxx \ split.cxx split.hxx \
superpoly.cxx superpoly.hxx superpoly.cxx superpoly.hxx
INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib

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

@ -16,4 +16,4 @@ libpoly2tri_a_SOURCES = \
tri.c \ tri.c \
triangulate.h triangulate.h
# INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib # INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/Lib

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

@ -34,4 +34,4 @@ shptest_LDADD = libshape.a
shputils_SOURCES = shputils.c shputils_SOURCES = shputils.c
shputils_LDADD = libshape.a shputils_LDADD = libshape.a
INCLUDES += -I$(top_builddir)/src INCLUDES += -I$(top_srcdir)/src

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

@ -33,7 +33,7 @@ demchop_LDADD = \
-lsgbucket -lsgmisc -lsgdebug -lz -lsgbucket -lsgmisc -lsgdebug -lz
$(base_LIBS) $(base_LIBS)
INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib
# We can't build this with "-O2" (optimization) since this causes a seg fault # 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 # I haven't found a way to strip this out of the CXXFLAGS, so I'm just

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

@ -33,7 +33,7 @@ deminfo_LDADD = \
-lsgbucket -lsgmisc -lz \ -lsgbucket -lsgmisc -lz \
$(base_LIBS) $(base_LIBS)
INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib
# We can't build this with "-O2" (optimization) since this causes a seg fault # 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 # I haven't found a way to strip this out of the CXXFLAGS, so I'm just

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

@ -19,4 +19,4 @@ debug_LDADD = \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgdebug -lsgbucket -lsgmisc -lz -lgpc -lsgdebug -lsgbucket -lsgmisc -lz -lgpc
INCLUDES += -I$(top_builddir)/src -I$(top_builddir)/src/Lib INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib

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

@ -12,4 +12,4 @@ testmerger_LDADD = \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgdebug -lsgbucket -lsgmisc -lz -lgpc -lsgdebug -lsgbucket -lsgmisc -lz -lgpc
INCLUDES += -I$(top_builddir)/src/Lib INCLUDES += -I$(top_srcdir)/src/Lib

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

@ -8,4 +8,4 @@ shape_decode_LDADD = \
$(top_builddir)/src/Lib/shapelib/libshape.a \ $(top_builddir)/src/Lib/shapelib/libshape.a \
-lsgdebug -lsgbucket -lsgmisc -lz -lgpc -lsgdebug -lsgbucket -lsgmisc -lz -lgpc
INCLUDES += -I$(top_builddir)/src/Lib INCLUDES += -I$(top_srcdir)/src/Lib