Only use configure variables to pass ldflags

Closes #4318

git-svn-id: http://svn.osgeo.org/postgis/trunk@17246 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
index 33807b0e073c08fc332c908aa7630bd8a439a146..dd4861cd82d5d731e8331e26d81862c7cce6fe2c 100644 (file)
--- a/liblwgeom/Makefile.in
+++ b/liblwgeom/Makefile.in
@@ -24,8 +24,8 @@
 
 CC = @CC@
 CPPFLAGS = @CPPFLAGS@
-CFLAGS = @WARNFLAGS@ @CFLAGS@ @PICFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
-LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@ -lm
+CFLAGS = @WARNFLAGS@ @CFLAGS@ @PICFLAGS@
+LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ @PROJ_LDFLAGS@ @JSON_LDFLAGS@ -lm
 NUMERICFLAGS = @NUMERICFLAGS@
 top_builddir = @top_builddir@
 prefix = @prefix@

diff --git a/liblwgeom/cunit/Makefile.in b/liblwgeom/cunit/Makefile.in
index 02b18ed99af5030034bb22300ae09c35480851fa..06952f8d2d4b0f1e4be79bd65875e63fa19d4828 100644 (file)
--- a/liblwgeom/cunit/Makefile.in
+++ b/liblwgeom/cunit/Makefile.in
@@ -15,10 +15,9 @@ SHELL = @SHELL@
 LIBTOOL = @LIBTOOL@
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I..
-
-CFLAGS=$(CUNIT_CPPFLAGS) @WARNFLAGS@ @CFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ 
-LDFLAGS = @GEOS_LDFLAGS@ -lgeos_c $(CUNIT_LDFLAGS) -lm
+CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I.. @CPPFLAGS@
+CFLAGS=$(CUNIT_CPPFLAGS) @WARNFLAGS@ @CFLAGS@
+LDFLAGS = @GEOS_LDFLAGS@ $(CUNIT_LDFLAGS) -lm
 
 ifeq ($(CUNIT_WITH_VALGRIND), YES)
        LIBTOOL_VALGRIND := valgrind $(CUNIT_VALGRIND_FLAGS)

diff --git a/loader/cunit/Makefile.in b/loader/cunit/Makefile.in
index 906784552a907b6d2498f1e8953c7b2a6a639df2..253a1c05c3e8c8bd573418666ba749e3c213a64c 100644 (file)
--- a/loader/cunit/Makefile.in
+++ b/loader/cunit/Makefile.in
@@ -40,7 +40,7 @@ GETTEXT_LDFLAGS = @GETTEXT_LDFLAGS@ @LIBINTL@
 
 # Proj flags
 PROJ_CFLAGS=@PROJ_CPPFLAGS@
-PROJ_LDFLAGS=@PROJ_LDFLAGS@ -lproj
+PROJ_LDFLAGS=@PROJ_LDFLAGS@
 
 # Built out CFLAGS with ICONV and GETTEXT
 CFLAGS += $(GETTEXT_CFLAGS) $(ICONV_CFLAGS) $(PROJ_CFLAGS)

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 3fce06d32da510f8501ff5a6b198c3e4844e47ec..133bc3d83c3e18befdf1b4822dba33b38157a92b 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -136,7 +136,7 @@ OBJS=$(PG_OBJS)
 # to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
 # older version of PostGIS, rather than with the static liblwgeom.a
 # supplied with newer versions of PostGIS
-PG_CPPFLAGS += -I../liblwgeom @CFLAGS@ -I../libpgcommon $(WAYGU_INCLUDE) @CPPFLAGS@ -fPIC
+PG_CPPFLAGS += -I../liblwgeom @CFLAGS@ -I../libpgcommon $(WAYGU_INCLUDE) @CPPFLAGS@ @PICFLAGS@
 SHLIB_LINK_F = $(WAYGU_LIB) ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@
 
 # Add SFCGAL Flags if defined

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index 647eb3d6531e8555b16830360a842030109f30f5..badfe1561d1eb517fe50d103edf05f33584cce38 100644 (file)
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -43,7 +43,7 @@ LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 LIBGDAL_DEPLIBS_LDFLAGS=@LIBGDAL_DEPLIBS_LDFLAGS@
 PROJ_CFLAGS=@PROJ_CPPFLAGS@
 GEOS_CFLAGS=@GEOS_CPPFLAGS@
-GEOS_LDFLAGS=@GEOS_LDFLAGS@ -lgeos_c
+GEOS_LDFLAGS=@GEOS_LDFLAGS@
 
 RTCORE_CFLAGS=-I$(RT_CORE)
 RTCORE_LDFLAGS=$(RT_CORE)/librtcore.a

diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
index 1ec49cd18f9beba192c8d3258d5bfae296216df0..232bcb9e7fa87c7b39a36f5a068af8c860e4cb18 100644 (file)
--- a/raster/rt_core/Makefile.in
+++ b/raster/rt_core/Makefile.in
@@ -25,8 +25,8 @@ LIBLWGEOM_LDFLAGS = ../../liblwgeom/.libs/liblwgeom.a
 LIBLWGEOM_CFLAGS = -I../../liblwgeom
 LIBGDAL_CFLAGS = @LIBGDAL_CFLAGS@
 LIBGDAL_LDFLAGS = @LIBGDAL_LDFLAGS@
-GEOS_LDFLAGS = @GEOS_LDFLAGS@ -lgeos_c
-PROJ_LDFLAGS = @PROJ_LDFLAGS@ -lproj
+GEOS_LDFLAGS = @GEOS_LDFLAGS@
+PROJ_LDFLAGS = @PROJ_LDFLAGS@
 LDFLAGS = $(LIBLWGEOM_LDFLAGS) $(LIBGDAL_LDFLAGS) $(PROJ_LDFLAGS) $(GEOS_LDFLAGS)
 CFLAGS = $(LIBLWGEOM_CFLAGS) @WARNFLAGS@ @CFLAGS@ @PICFLAGS@ $(LIBGDAL_CFLAGS) @PROJ_CPPFLAGS@ @GEOS_CPPFLAGS@
 

diff --git a/raster/test/cunit/Makefile.in b/raster/test/cunit/Makefile.in
index 37f13d358602461395aa12a24f6bf5beaf094c3f..f5f00a96dcf75ff557e550c0d14e33b88ee24688 100644 (file)
--- a/raster/test/cunit/Makefile.in
+++ b/raster/test/cunit/Makefile.in
@@ -21,9 +21,9 @@ LIBLWGEOM_CFLAGS=-I../../../liblwgeom
 LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
 LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 PROJ_CFLAGS=@PROJ_CPPFLAGS@
-PROJ_LDFLAGS=@PROJ_LDFLAGS@ -lproj
+PROJ_LDFLAGS=@PROJ_LDFLAGS@
 GEOS_CFLAGS=@GEOS_CPPFLAGS@
-GEOS_LDFLAGS=@GEOS_LDFLAGS@ -lgeos_c
+GEOS_LDFLAGS=@GEOS_LDFLAGS@
 
 RTCORE_CFLAGS=-I$(RT_CORE)
 RTCORE_LDFLAGS=$(RT_CORE)/librtcore.a

diff --git a/topology/Makefile.in b/topology/Makefile.in
index 48e71ddaf34fac354251a8083397fab39072cbd4..264bf06b3a2a63a08e236b93d67cbc9401d879ab 100644 (file)
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -50,7 +50,7 @@ OBJS = postgis_topology.o
 # to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
 # older version of PostGIS, rather than with the static liblwgeom.a
 # supplied with newer versions of PostGIS
-PG_CPPFLAGS += -I../liblwgeom @CFLAGS@ -I../libpgcommon @CPPFLAGS@ -fPIC
+PG_CPPFLAGS += -I../liblwgeom @CFLAGS@ -I../libpgcommon @CPPFLAGS@ @PICFLAGS@
 SHLIB_LINK_F = ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@
 
 # Add SFCGAL Flags if defined