From 19d9392863882fca29dfad5326d855118947ed5b Mon Sep 17 00:00:00 2001 From: curt <curt> Date: Wed, 11 Jul 2001 00:43:55 +0000 Subject: [PATCH] Renamed libgpc to libgenpolyclip to avoid a conflict with the gnu pascal compiler. --- src/Airports/GenAirports/Makefile.am | 2 +- src/BuildTiles/Clipper/Makefile.am | 2 +- src/BuildTiles/Main/Makefile.am | 2 +- src/Prep/E00Lines/Makefile.am | 2 +- src/Prep/GSHHS/Makefile.am | 4 ++-- src/Prep/MergerClipper/Makefile.am | 2 +- src/Prep/Photo/Makefile.am | 2 +- src/Prep/ShapeFile/Makefile.am | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Airports/GenAirports/Makefile.am b/src/Airports/GenAirports/Makefile.am index a353c40d..0f21af5a 100644 --- a/src/Airports/GenAirports/Makefile.am +++ b/src/Airports/GenAirports/Makefile.am @@ -40,7 +40,7 @@ genapts_LDADD = \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/Output/libOutput.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgpc \ + -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgenpolyclip \ $(base_LIBS) INCLUDES += \ diff --git a/src/BuildTiles/Clipper/Makefile.am b/src/BuildTiles/Clipper/Makefile.am index 7af44132..f34e3a2c 100644 --- a/src/BuildTiles/Clipper/Makefile.am +++ b/src/BuildTiles/Clipper/Makefile.am @@ -13,6 +13,6 @@ testclipper_LDADD = \ $(top_builddir)/src/Lib/Polygon/libPolygon.a \ $(top_builddir)/src/Lib/landcover/liblandcover.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - -lsgbucket -lsgdebug -lsgmisc -lz -lgpc + -lsgbucket -lsgdebug -lsgmisc -lz -lgenpolyclip INCLUDES += -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 12a5f9a0..4b98917a 100644 --- a/src/BuildTiles/Main/Makefile.am +++ b/src/BuildTiles/Main/Makefile.am @@ -18,7 +18,7 @@ fgfs_construct_LDADD = \ $(top_builddir)/src/Lib/landcover/liblandcover.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lplibsg -lz -lgpc + -lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lplibsg -lz -lgenpolyclip fgfs_master_SOURCES = master.cxx diff --git a/src/Prep/E00Lines/Makefile.am b/src/Prep/E00Lines/Makefile.am index 8caea46c..38533822 100644 --- a/src/Prep/E00Lines/Makefile.am +++ b/src/Prep/E00Lines/Makefile.am @@ -6,6 +6,6 @@ e00lines_LDADD = \ $(top_builddir)/src/Lib/Polygon/libPolygon.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/e00/libe00.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lz -lgpc + -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lz -lgenpolyclip INCLUDES += -I$(top_srcdir)/src/Lib diff --git a/src/Prep/GSHHS/Makefile.am b/src/Prep/GSHHS/Makefile.am index f2fd5591..edf9fc34 100644 --- a/src/Prep/GSHHS/Makefile.am +++ b/src/Prep/GSHHS/Makefile.am @@ -8,7 +8,7 @@ gshhs_SOURCES = \ gshhs_LDADD = \ $(top_builddir)/src/Lib/Polygon/libPolygon.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - -lsgdebug -lsgbucket -lsgmisc -lz -lgpc + -lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip debug_SOURCES = \ debug.cxx @@ -16,6 +16,6 @@ debug_SOURCES = \ debug_LDADD = \ $(top_builddir)/src/Lib/Polygon/libPolygon.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - -lsgdebug -lsgbucket -lsgmisc -lz -lgpc + -lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip 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 04bd1e96..b1e5f8f2 100644 --- a/src/Prep/MergerClipper/Makefile.am +++ b/src/Prep/MergerClipper/Makefile.am @@ -10,6 +10,6 @@ testmerger_LDADD = \ $(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 + -lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip INCLUDES += -I$(top_srcdir)/src/Lib diff --git a/src/Prep/Photo/Makefile.am b/src/Prep/Photo/Makefile.am index ac269084..9a20aac7 100644 --- a/src/Prep/Photo/Makefile.am +++ b/src/Prep/Photo/Makefile.am @@ -36,7 +36,7 @@ photo_LDADD = \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/Output/libOutput.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgpc \ + -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgenpolyclip \ $(base_LIBS) wgs84offset_SOURCES = wgs84offset.cxx diff --git a/src/Prep/ShapeFile/Makefile.am b/src/Prep/ShapeFile/Makefile.am index da613c52..1fa9f452 100644 --- a/src/Prep/ShapeFile/Makefile.am +++ b/src/Prep/ShapeFile/Makefile.am @@ -8,12 +8,12 @@ shape_decode_LDADD = \ $(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 + -lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip noaa_decode_LDADD = \ $(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 + -lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip INCLUDES += -I$(top_srcdir)/src/Lib