From 65d6f9c6237cc0ba37064ef320fecbd56183a38d Mon Sep 17 00:00:00 2001 From: curt Date: Thu, 29 Aug 2002 22:12:43 +0000 Subject: [PATCH] Tweaks to bring the automake/conf scripts into compliance. --- src/Airports/GenAirports/Makefile.am | 2 +- src/BuildTiles/Clipper/Makefile.am | 2 +- src/BuildTiles/GenOutput/Makefile.am | 2 +- src/BuildTiles/Main/Makefile.am | 2 +- src/BuildTiles/Match/Makefile.am | 2 +- src/BuildTiles/Osgb36/Makefile.am | 2 +- src/BuildTiles/Parallel/Makefile.am | 2 +- src/BuildTiles/Triangulate/Makefile.am | 2 +- src/Lib/Array/Makefile.am | 2 +- src/Lib/DEM/Makefile.am | 2 +- src/Lib/Geometry/Makefile.am | 2 +- src/Lib/Optimize/Makefile.am | 2 +- src/Lib/Output/Makefile.am | 2 +- src/Lib/Polygon/Makefile.am | 2 +- src/Lib/TriangleJRS/Makefile.am | 2 +- src/Lib/e00/Makefile.am | 2 +- src/Lib/poly2tri/Makefile.am | 6 +----- src/Lib/shapelib/Makefile.am | 2 +- src/Prep/DemChop/Makefile.am | 2 +- src/Prep/DemInfo/Makefile.am | 2 +- src/Prep/DemRaw2ascii/Makefile.am | 5 ----- src/Prep/E00Lines/Makefile.am | 2 +- src/Prep/GSHHS/Makefile.am | 2 +- src/Prep/MergerClipper/Makefile.am | 2 +- src/Prep/Photo/Makefile.am | 2 +- src/Prep/ShapeFile/Makefile.am | 2 +- src/Prep/TGVPF/Makefile.am | 2 +- src/Prep/UserDef/Makefile.am | 2 +- 28 files changed, 27 insertions(+), 36 deletions(-) diff --git a/src/Airports/GenAirports/Makefile.am b/src/Airports/GenAirports/Makefile.am index cf5ea82e..62a65e1b 100644 --- a/src/Airports/GenAirports/Makefile.am +++ b/src/Airports/GenAirports/Makefile.am @@ -53,7 +53,7 @@ genapts_LDADD = \ -lz \ $(base_LIBS) -INCLUDES += \ +INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/Lib \ diff --git a/src/BuildTiles/Clipper/Makefile.am b/src/BuildTiles/Clipper/Makefile.am index b3ffc0f4..c5264793 100644 --- a/src/BuildTiles/Clipper/Makefile.am +++ b/src/BuildTiles/Clipper/Makefile.am @@ -15,4 +15,4 @@ testclipper_LDADD = \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ -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 diff --git a/src/BuildTiles/GenOutput/Makefile.am b/src/BuildTiles/GenOutput/Makefile.am index 15b7f9b6..de0a7a51 100644 --- a/src/BuildTiles/GenOutput/Makefile.am +++ b/src/BuildTiles/GenOutput/Makefile.am @@ -2,7 +2,7 @@ noinst_LIBRARIES = libGenOutput.a libGenOutput_a_SOURCES = genobj.cxx genobj.hxx -INCLUDES += \ +INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/Lib \ -I$(top_srcdir)/src/BuildTiles diff --git a/src/BuildTiles/Main/Makefile.am b/src/BuildTiles/Main/Makefile.am index 63036b9d..42905332 100644 --- a/src/BuildTiles/Main/Makefile.am +++ b/src/BuildTiles/Main/Makefile.am @@ -25,7 +25,7 @@ fgfs_master_SOURCES = master.cxx fgfs_master_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml -INCLUDES += \ +INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/Lib \ -I$(top_srcdir)/src/BuildTiles diff --git a/src/BuildTiles/Match/Makefile.am b/src/BuildTiles/Match/Makefile.am index 9e90d8b9..6f1e86ce 100644 --- a/src/BuildTiles/Match/Makefile.am +++ b/src/BuildTiles/Match/Makefile.am @@ -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/BuildTiles +INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles diff --git a/src/BuildTiles/Osgb36/Makefile.am b/src/BuildTiles/Osgb36/Makefile.am index cbcef359..613bd055 100644 --- a/src/BuildTiles/Osgb36/Makefile.am +++ b/src/BuildTiles/Osgb36/Makefile.am @@ -6,6 +6,6 @@ noinst_PROGRAMS = testosgb36 testosgb36_SOURCES = testosgb36.cxx -INCLUDES += \ +INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/Lib diff --git a/src/BuildTiles/Parallel/Makefile.am b/src/BuildTiles/Parallel/Makefile.am index 3146bbe7..aab470d7 100644 --- a/src/BuildTiles/Parallel/Makefile.am +++ b/src/BuildTiles/Parallel/Makefile.am @@ -10,7 +10,7 @@ fgfs_tools_client_SOURCES = client.cxx fgfs_tools_client_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml -INCLUDES += \ +INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/Lib \ -I$(top_srcdir)/src/BuildTiles diff --git a/src/BuildTiles/Triangulate/Makefile.am b/src/BuildTiles/Triangulate/Makefile.am index cff5efa3..f5ddfcc6 100644 --- a/src/BuildTiles/Triangulate/Makefile.am +++ b/src/BuildTiles/Triangulate/Makefile.am @@ -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/BuildTiles +INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles diff --git a/src/Lib/Array/Makefile.am b/src/Lib/Array/Makefile.am index b7e64a20..9bed153e 100644 --- a/src/Lib/Array/Makefile.am +++ b/src/Lib/Array/Makefile.am @@ -10,4 +10,4 @@ testarray_LDADD = \ $(top_builddir)/src/Lib/Array/libArray.a \ -lsgbucket -lsgmath -lsgmisc -lsgdebug -lsgxml -lz -INCLUDES += -I$(top_srcdir)/src +INCLUDES = -I$(top_srcdir)/src diff --git a/src/Lib/DEM/Makefile.am b/src/Lib/DEM/Makefile.am index f9cfadf8..4820e20b 100644 --- a/src/Lib/DEM/Makefile.am +++ b/src/Lib/DEM/Makefile.am @@ -2,5 +2,5 @@ noinst_LIBRARIES = libDEM.a libDEM_a_SOURCES = dem.cxx dem.hxx -INCLUDES += -I$(top_srcdir)/src +INCLUDES = -I$(top_srcdir)/src diff --git a/src/Lib/Geometry/Makefile.am b/src/Lib/Geometry/Makefile.am index 55d54567..20b07e3a 100644 --- a/src/Lib/Geometry/Makefile.am +++ b/src/Lib/Geometry/Makefile.am @@ -9,7 +9,7 @@ libGeometry_a_SOURCES = \ trisegs.cxx trisegs.hxx \ util.cxx util.hxx -INCLUDES += \ +INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/Lib \ -I$(top_srcdir)/src/BuildTiles diff --git a/src/Lib/Optimize/Makefile.am b/src/Lib/Optimize/Makefile.am index d9866762..e6959c42 100644 --- a/src/Lib/Optimize/Makefile.am +++ b/src/Lib/Optimize/Makefile.am @@ -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/BuildTiles +INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles diff --git a/src/Lib/Output/Makefile.am b/src/Lib/Output/Makefile.am index 96785151..b65f1b80 100644 --- a/src/Lib/Output/Makefile.am +++ b/src/Lib/Output/Makefile.am @@ -3,4 +3,4 @@ noinst_LIBRARIES = libOutput.a libOutput_a_SOURCES = \ output.cxx output.hxx -INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib diff --git a/src/Lib/Polygon/Makefile.am b/src/Lib/Polygon/Makefile.am index a7d42338..6c69fc01 100644 --- a/src/Lib/Polygon/Makefile.am +++ b/src/Lib/Polygon/Makefile.am @@ -8,4 +8,4 @@ libPolygon_a_SOURCES = \ split-bin.cxx split.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 diff --git a/src/Lib/TriangleJRS/Makefile.am b/src/Lib/TriangleJRS/Makefile.am index 4bde3e38..2d4a2575 100644 --- a/src/Lib/TriangleJRS/Makefile.am +++ b/src/Lib/TriangleJRS/Makefile.am @@ -9,7 +9,7 @@ # # CPPFLAGS = -DTRILIBRARY -DREDUCED -DCDT_ONLY -CPPFLAGS += -DTRILIBRARY +AM_CFLAGS = -DTRILIBRARY noinst_LIBRARIES = libTriangleJRS.a diff --git a/src/Lib/e00/Makefile.am b/src/Lib/e00/Makefile.am index 12b4f401..f08e7ad6 100644 --- a/src/Lib/e00/Makefile.am +++ b/src/Lib/e00/Makefile.am @@ -7,6 +7,6 @@ noinst_PROGRAMS = teste00 teste00_SOURCES = teste00.cxx teste00_LDADD = libe00.a -lsgmisc -lsgdebug -lsgxml -lz -INCLUDES += \ +INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/Lib diff --git a/src/Lib/poly2tri/Makefile.am b/src/Lib/poly2tri/Makefile.am index cf79f27a..034d2499 100644 --- a/src/Lib/poly2tri/Makefile.am +++ b/src/Lib/poly2tri/Makefile.am @@ -1,10 +1,6 @@ EXTRA_DIST = README makefile.orig data_1 -# if OLD_AUTOMAKE -# CFLAGS += -DSTANDALONE -# else # AM_CFLAGS = -DSTANDALONE -# endif noinst_LIBRARIES = libpoly2tri.a @@ -16,4 +12,4 @@ libpoly2tri_a_SOURCES = \ tri.c \ triangulate.h -# INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/Lib +# INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/Lib diff --git a/src/Lib/shapelib/Makefile.am b/src/Lib/shapelib/Makefile.am index 9a01d232..a295f835 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_srcdir)/src +INCLUDES = -I$(top_srcdir)/src diff --git a/src/Prep/DemChop/Makefile.am b/src/Prep/DemChop/Makefile.am index 36e81bc1..62c15f8a 100644 --- a/src/Prep/DemChop/Makefile.am +++ b/src/Prep/DemChop/Makefile.am @@ -33,7 +33,7 @@ demchop_LDADD = \ -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz $(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 # 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 726db41f..07ebe44c 100644 --- a/src/Prep/DemInfo/Makefile.am +++ b/src/Prep/DemInfo/Makefile.am @@ -33,7 +33,7 @@ deminfo_LDADD = \ -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz \ $(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 # 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 797e5b52..ad5209ba 100644 --- a/src/Prep/DemRaw2ascii/Makefile.am +++ b/src/Prep/DemRaw2ascii/Makefile.am @@ -28,8 +28,3 @@ bin_PROGRAMS = raw2ascii raw2ascii_SOURCES = main.c rawdem.c rawdem.h raw2ascii_LDADD = $(base_LIBS) - -# INCLUDES += - - -#--------------------------------------------------------------------------- diff --git a/src/Prep/E00Lines/Makefile.am b/src/Prep/E00Lines/Makefile.am index cf18278f..00d5e78a 100644 --- a/src/Prep/E00Lines/Makefile.am +++ b/src/Prep/E00Lines/Makefile.am @@ -9,4 +9,4 @@ e00lines_LDADD = \ $(top_builddir)/src/Lib/e00/libe00.a \ -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz -INCLUDES += -I$(top_srcdir)/src/Lib +INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/GSHHS/Makefile.am b/src/Prep/GSHHS/Makefile.am index f7a21638..d0eecfb0 100644 --- a/src/Prep/GSHHS/Makefile.am +++ b/src/Prep/GSHHS/Makefile.am @@ -18,4 +18,4 @@ debug_LDADD = \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ -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 diff --git a/src/Prep/MergerClipper/Makefile.am b/src/Prep/MergerClipper/Makefile.am index c0178eba..da323415 100644 --- a/src/Prep/MergerClipper/Makefile.am +++ b/src/Prep/MergerClipper/Makefile.am @@ -12,4 +12,4 @@ testmerger_LDADD = \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ -lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz -INCLUDES += -I$(top_srcdir)/src/Lib +INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/Photo/Makefile.am b/src/Prep/Photo/Makefile.am index 121c52e9..0267a5f0 100644 --- a/src/Prep/Photo/Makefile.am +++ b/src/Prep/Photo/Makefile.am @@ -47,7 +47,7 @@ findcorners_SOURCES = findcorners.cxx findcorners_LDADD = -lsgmath -lsgdebug -INCLUDES += \ +INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/Lib \ diff --git a/src/Prep/ShapeFile/Makefile.am b/src/Prep/ShapeFile/Makefile.am index f33fc16b..2b275e12 100644 --- a/src/Prep/ShapeFile/Makefile.am +++ b/src/Prep/ShapeFile/Makefile.am @@ -16,4 +16,4 @@ noaa_decode_LDADD = \ $(top_builddir)/src/Lib/shapelib/libshape.a \ -lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz -INCLUDES += -I$(top_srcdir)/src/Lib +INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/TGVPF/Makefile.am b/src/Prep/TGVPF/Makefile.am index 524f8682..53542407 100644 --- a/src/Prep/TGVPF/Makefile.am +++ b/src/Prep/TGVPF/Makefile.am @@ -9,4 +9,4 @@ tgvpf_LDADD = \ $(top_builddir)/src/Lib/vpf/libvpf.a \ -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz -INCLUDES += -I$(top_srcdir)/src/Lib +INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/UserDef/Makefile.am b/src/Prep/UserDef/Makefile.am index 49ac5715..7c3eb15b 100644 --- a/src/Prep/UserDef/Makefile.am +++ b/src/Prep/UserDef/Makefile.am @@ -8,4 +8,4 @@ tguserdef_LDADD = \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lsgdebug -lgenpolyclip -lz -INCLUDES += -I$(top_srcdir)/src/Lib +INCLUDES = -I$(top_srcdir)/src/Lib