diff --git a/src/Airports/GenAirports/Makefile.am b/src/Airports/GenAirports/Makefile.am index 652693dc..5add8d2b 100644 --- a/src/Airports/GenAirports/Makefile.am +++ b/src/Airports/GenAirports/Makefile.am @@ -50,8 +50,9 @@ 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 -lsgxml -lgenpolyclip \ - -lnurbsf -lmatrixI -lmatrixN -lmatrix \ + -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgstructure -lsgxml \ + -lgenpolyclip \ + -lnurbsf -lmatrixI -lmatrixN -lmatrix \ -lz \ $(base_LIBS) diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx index 9b834e76..d72a5f61 100644 --- a/src/Airports/GenAirports/build.cxx +++ b/src/Airports/GenAirports/build.cxx @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include // for atoi() atof() diff --git a/src/Airports/GenAirports/convex_hull.cxx b/src/Airports/GenAirports/convex_hull.cxx index 1027040f..8ec0723a 100644 --- a/src/Airports/GenAirports/convex_hull.cxx +++ b/src/Airports/GenAirports/convex_hull.cxx @@ -32,7 +32,7 @@ #include #include -#include +#include SG_USING_STD(less); SG_USING_STD(map); diff --git a/src/Airports/GenAirports/main.cxx b/src/Airports/GenAirports/main.cxx index d73567b1..00034f48 100644 --- a/src/Airports/GenAirports/main.cxx +++ b/src/Airports/GenAirports/main.cxx @@ -27,7 +27,7 @@ #endif #include -#include +#include #ifdef HAVE_STDLIB_H #include diff --git a/src/BuildTiles/Clipper/Makefile.am b/src/BuildTiles/Clipper/Makefile.am index 65775d07..dbdfffce 100644 --- a/src/BuildTiles/Clipper/Makefile.am +++ b/src/BuildTiles/Clipper/Makefile.am @@ -15,6 +15,7 @@ testclipper_LDADD = \ $(top_builddir)/src/Lib/landcover/liblandcover.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgdebug -lsgmisc -lsgxml -lgenpolyclip -lz + -lsgbucket -lsgdebug -lsgmisc -lsgstructure -lsgxml \ + -lgenpolyclip -lz 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 42905332..aaebf756 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 -lsgxml \ + -lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lsgstructure -lsgxml \ -lplibsg -lplibul -lgenpolyclip -lz fgfs_master_SOURCES = master.cxx diff --git a/src/Lib/Geometry/util.cxx b/src/Lib/Geometry/util.cxx index 3f986cf4..5f90bfb2 100644 --- a/src/Lib/Geometry/util.cxx +++ b/src/Lib/Geometry/util.cxx @@ -8,7 +8,7 @@ #include #include -#include +#include #include diff --git a/src/Lib/Polygon/polygon.cxx b/src/Lib/Polygon/polygon.cxx index 7bc1af82..c6381d13 100644 --- a/src/Lib/Polygon/polygon.cxx +++ b/src/Lib/Polygon/polygon.cxx @@ -32,7 +32,7 @@ extern "C" { #include #include #include -#include +#include SG_USING_STD(endl); diff --git a/src/Lib/Polygon/simple_clip.cxx b/src/Lib/Polygon/simple_clip.cxx index 90004c26..a3e8ce3e 100644 --- a/src/Lib/Polygon/simple_clip.cxx +++ b/src/Lib/Polygon/simple_clip.cxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include "simple_clip.hxx" diff --git a/src/Lib/Polygon/split-bin.cxx b/src/Lib/Polygon/split-bin.cxx index 5525bbc8..424e7bf7 100644 --- a/src/Lib/Polygon/split-bin.cxx +++ b/src/Lib/Polygon/split-bin.cxx @@ -30,7 +30,7 @@ #include #include -#include +#include #ifdef _MSC_VER # include diff --git a/src/Prep/E00Lines/Makefile.am b/src/Prep/E00Lines/Makefile.am index e0b65b87..5a3e0d28 100644 --- a/src/Prep/E00Lines/Makefile.am +++ b/src/Prep/E00Lines/Makefile.am @@ -8,6 +8,7 @@ e00lines_LDADD = \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/e00/libe00.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz + -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgstructure -lsgxml \ + -lgenpolyclip -lz INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/GSHHS/Makefile.am b/src/Prep/GSHHS/Makefile.am index 7cfd8484..aadd2020 100644 --- a/src/Prep/GSHHS/Makefile.am +++ b/src/Prep/GSHHS/Makefile.am @@ -9,7 +9,7 @@ gshhs_LDADD = \ $(top_builddir)/src/Lib/Polygon/libPolygon.a \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz + -lsgdebug -lsgbucket -lsgmisc -lsgstructure -lsgxml -lgenpolyclip -lz debug_SOURCES = \ debug.cxx @@ -18,6 +18,6 @@ debug_LDADD = \ $(top_builddir)/src/Lib/Polygon/libPolygon.a \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz + -lsgdebug -lsgbucket -lsgmisc -lsgstructure -lsgxml -lgenpolyclip -lz 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 382fb874..31ccb058 100644 --- a/src/Prep/MergerClipper/Makefile.am +++ b/src/Prep/MergerClipper/Makefile.am @@ -12,6 +12,6 @@ testmerger_LDADD = \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz + -lsgdebug -lsgbucket -lsgmisc -lsgstructure -lsgxml -lgenpolyclip -lz INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/Photo/Makefile.am b/src/Prep/Photo/Makefile.am index 3f734e7d..f0350af6 100644 --- a/src/Prep/Photo/Makefile.am +++ b/src/Prep/Photo/Makefile.am @@ -36,7 +36,8 @@ 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 -lsgxml -lgenpolyclip -lz + -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgstructure -lsgxml \ + -lgenpolyclip -lz $(base_LIBS) wgs84offset_SOURCES = wgs84offset.cxx diff --git a/src/Prep/ShapeFile/Makefile.am b/src/Prep/ShapeFile/Makefile.am index 943b74a9..13af0380 100644 --- a/src/Prep/ShapeFile/Makefile.am +++ b/src/Prep/ShapeFile/Makefile.am @@ -10,7 +10,7 @@ shape_decode_LDADD = \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/shapelib/libshape.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz + -lsgdebug -lsgbucket -lsgmisc -lsgstructure -lsgxml -lgenpolyclip -lz noaa_decode_LDADD = \ $(top_builddir)/src/Lib/Polygon/libPolygon.a \ @@ -18,6 +18,6 @@ noaa_decode_LDADD = \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/shapelib/libshape.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz + -lsgdebug -lsgbucket -lsgmisc -lsgstructure -lsgxml -lgenpolyclip -lz INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/TGVPF/Makefile.am b/src/Prep/TGVPF/Makefile.am index c760ead1..cfc3a09a 100644 --- a/src/Prep/TGVPF/Makefile.am +++ b/src/Prep/TGVPF/Makefile.am @@ -8,6 +8,7 @@ tgvpf_LDADD = \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/vpf/libvpf.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz + -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgstructure -lsgxml \ + -lgenpolyclip -lz INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/UserDef/Makefile.am b/src/Prep/UserDef/Makefile.am index d914e1ad..68deac25 100644 --- a/src/Prep/UserDef/Makefile.am +++ b/src/Prep/UserDef/Makefile.am @@ -7,7 +7,8 @@ tguserdef_LDADD = \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgmisc -lsgmath -lsgprops -lsgio -lsgxml -lsgdebug \ + -lsgbucket -lsgmisc -lsgmath -lsgprops -lsgio -lsgstructure -lsgxml \ + -lsgdebug \ -lgenpolyclip -lz INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/UserDef/tguserdef.cxx b/src/Prep/UserDef/tguserdef.cxx index 68703f3f..3d226b48 100644 --- a/src/Prep/UserDef/tguserdef.cxx +++ b/src/Prep/UserDef/tguserdef.cxx @@ -4,9 +4,9 @@ #include #include -#include #include #include +#include #include #include