fly/terragear
1
0
Fork 0
Code Activity

Tweaks to bring the automake/conf scripts into compliance.

Browse source
This commit is contained in:
curt 2002-08-29 22:12:43 +00:00
parent 13895ab1dd
commit 65d6f9c623
28 changed files with 27 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@ genapts_LDADD = \
-lz \ -lz \
$(base_LIBS) $(base_LIBS)
INCLUDES += \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/Lib \ -I$(top_srcdir)/src/Lib \

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

@ -15,4 +15,4 @@ testclipper_LDADD = \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgbucket -lsgdebug -lsgmisc -lsgxml -lgenpolyclip -lz -lsgbucket -lsgdebug -lsgmisc -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles

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

@ -2,7 +2,7 @@ noinst_LIBRARIES = libGenOutput.a
libGenOutput_a_SOURCES = genobj.cxx genobj.hxx libGenOutput_a_SOURCES = genobj.cxx genobj.hxx
INCLUDES += \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/src/Lib \ -I$(top_srcdir)/src/Lib \
-I$(top_srcdir)/src/BuildTiles -I$(top_srcdir)/src/BuildTiles

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

@ -25,7 +25,7 @@ fgfs_master_SOURCES = master.cxx
fgfs_master_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml fgfs_master_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml
INCLUDES += \ INCLUDES = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/Lib \ -I$(top_srcdir)/src/Lib \
-I$(top_srcdir)/src/BuildTiles -I$(top_srcdir)/src/BuildTiles

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_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles

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

@ -6,6 +6,6 @@ noinst_PROGRAMS = testosgb36
testosgb36_SOURCES = testosgb36.cxx testosgb36_SOURCES = testosgb36.cxx
INCLUDES += \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/Lib

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

@ -10,7 +10,7 @@ fgfs_tools_client_SOURCES = client.cxx
fgfs_tools_client_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml fgfs_tools_client_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml
INCLUDES += \ INCLUDES = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/Lib \ -I$(top_srcdir)/src/Lib \
-I$(top_srcdir)/src/BuildTiles -I$(top_srcdir)/src/BuildTiles

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_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles

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 -lsgdebug -lsgxml -lz -lsgbucket -lsgmath -lsgmisc -lsgdebug -lsgxml -lz
INCLUDES += -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir)/src

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

@ -2,5 +2,5 @@ noinst_LIBRARIES = libDEM.a
libDEM_a_SOURCES = dem.cxx dem.hxx libDEM_a_SOURCES = dem.cxx dem.hxx
INCLUDES += -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir)/src

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

@ -9,7 +9,7 @@ libGeometry_a_SOURCES = \
trisegs.cxx trisegs.hxx \ trisegs.cxx trisegs.hxx \
util.cxx util.hxx util.cxx util.hxx
INCLUDES += \ INCLUDES = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/Lib \ -I$(top_srcdir)/src/Lib \
-I$(top_srcdir)/src/BuildTiles -I$(top_srcdir)/src/BuildTiles

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_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles

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

@ -3,4 +3,4 @@ noinst_LIBRARIES = libOutput.a
libOutput_a_SOURCES = \ libOutput_a_SOURCES = \
output.cxx output.hxx output.cxx output.hxx
INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib

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

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

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

@ -9,7 +9,7 @@
# #
# CPPFLAGS = -DTRILIBRARY -DREDUCED -DCDT_ONLY # CPPFLAGS = -DTRILIBRARY -DREDUCED -DCDT_ONLY
CPPFLAGS += -DTRILIBRARY AM_CFLAGS = -DTRILIBRARY
noinst_LIBRARIES = libTriangleJRS.a noinst_LIBRARIES = libTriangleJRS.a

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

@ -7,6 +7,6 @@ noinst_PROGRAMS = teste00
teste00_SOURCES = teste00.cxx teste00_SOURCES = teste00.cxx
teste00_LDADD = libe00.a -lsgmisc -lsgdebug -lsgxml -lz teste00_LDADD = libe00.a -lsgmisc -lsgdebug -lsgxml -lz
INCLUDES += \ INCLUDES = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/Lib

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

@ -1,10 +1,6 @@
EXTRA_DIST = README makefile.orig data_1 EXTRA_DIST = README makefile.orig data_1
# if OLD_AUTOMAKE
# CFLAGS += -DSTANDALONE
# else
# AM_CFLAGS = -DSTANDALONE # AM_CFLAGS = -DSTANDALONE
# endif
noinst_LIBRARIES = libpoly2tri.a noinst_LIBRARIES = libpoly2tri.a
@ -16,4 +12,4 @@ libpoly2tri_a_SOURCES = \
tri.c \ tri.c \
triangulate.h triangulate.h
# INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/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_srcdir)/src INCLUDES = -I$(top_srcdir)/src

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

@ -33,7 +33,7 @@ demchop_LDADD = \
-lsgbucket -lsgmisc -lsgdebug -lsgxml -lz -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz
$(base_LIBS) $(base_LIBS)
INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/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 -lsgdebug -lsgxml -lz \ -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz \
$(base_LIBS) $(base_LIBS)
INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/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

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

@ -28,8 +28,3 @@ bin_PROGRAMS = raw2ascii
raw2ascii_SOURCES = main.c rawdem.c rawdem.h raw2ascii_SOURCES = main.c rawdem.c rawdem.h
raw2ascii_LDADD = $(base_LIBS) raw2ascii_LDADD = $(base_LIBS)
# INCLUDES +=
#---------------------------------------------------------------------------

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

@ -9,4 +9,4 @@ e00lines_LDADD = \
$(top_builddir)/src/Lib/e00/libe00.a \ $(top_builddir)/src/Lib/e00/libe00.a \
-lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src/Lib

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

@ -18,4 +18,4 @@ debug_LDADD = \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/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 -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src/Lib

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

@ -47,7 +47,7 @@ findcorners_SOURCES = findcorners.cxx
findcorners_LDADD = -lsgmath -lsgdebug findcorners_LDADD = -lsgmath -lsgdebug
INCLUDES += \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/Lib \ -I$(top_srcdir)/src/Lib \

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

@ -16,4 +16,4 @@ noaa_decode_LDADD = \
$(top_builddir)/src/Lib/shapelib/libshape.a \ $(top_builddir)/src/Lib/shapelib/libshape.a \
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src/Lib

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

@ -9,4 +9,4 @@ tgvpf_LDADD = \
$(top_builddir)/src/Lib/vpf/libvpf.a \ $(top_builddir)/src/Lib/vpf/libvpf.a \
-lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src/Lib

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

@ -8,4 +8,4 @@ tguserdef_LDADD = \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lsgdebug -lgenpolyclip -lz -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lsgdebug -lgenpolyclip -lz
INCLUDES += -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src/Lib