[postgis-tickets] r17246 - Only use configure variables to pass ldflags

[Raul]

Author: algunenano
Date: 2019-02-11 10:42:30 -0800 (Mon, 11 Feb 2019)
New Revision: 17246

Modified:
   trunk/liblwgeom/Makefile.in
   trunk/liblwgeom/cunit/Makefile.in
   trunk/loader/cunit/Makefile.in
   trunk/postgis/Makefile.in
   trunk/raster/loader/Makefile.in
   trunk/raster/rt_core/Makefile.in
   trunk/raster/test/cunit/Makefile.in
   trunk/topology/Makefile.in
Log:
Only use configure variables to pass ldflags

Closes #4318


Modified: trunk/liblwgeom/Makefile.in
===================================================================
--- trunk/liblwgeom/Makefile.in	2019-02-11 18:04:19 UTC (rev 17245)
+++ trunk/liblwgeom/Makefile.in	2019-02-11 18:42:30 UTC (rev 17246)
@@ -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@

Modified: trunk/liblwgeom/cunit/Makefile.in
===================================================================
--- trunk/liblwgeom/cunit/Makefile.in	2019-02-11 18:04:19 UTC (rev 17245)
+++ trunk/liblwgeom/cunit/Makefile.in	2019-02-11 18:42:30 UTC (rev 17246)
@@ -15,11 +15,10 @@
 LIBTOOL = @LIBTOOL@
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I..
+CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I.. @CPPFLAGS@
+CFLAGS=$(CUNIT_CPPFLAGS) @WARNFLAGS@ @CFLAGS@
+LDFLAGS = @GEOS_LDFLAGS@ $(CUNIT_LDFLAGS) -lm
 
-CFLAGS=$(CUNIT_CPPFLAGS) @WARNFLAGS@ @CFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ 
-LDFLAGS = @GEOS_LDFLAGS@ -lgeos_c $(CUNIT_LDFLAGS) -lm
-
 ifeq ($(CUNIT_WITH_VALGRIND), YES)
 	LIBTOOL_VALGRIND := valgrind $(CUNIT_VALGRIND_FLAGS)
 endif

Modified: trunk/loader/cunit/Makefile.in
===================================================================
--- trunk/loader/cunit/Makefile.in	2019-02-11 18:04:19 UTC (rev 17245)
+++ trunk/loader/cunit/Makefile.in	2019-02-11 18:42:30 UTC (rev 17246)
@@ -40,7 +40,7 @@
 
 # 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)

Modified: trunk/postgis/Makefile.in
===================================================================
--- trunk/postgis/Makefile.in	2019-02-11 18:04:19 UTC (rev 17245)
+++ trunk/postgis/Makefile.in	2019-02-11 18:42:30 UTC (rev 17246)
@@ -136,7 +136,7 @@
 # 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

Modified: trunk/raster/loader/Makefile.in
===================================================================
--- trunk/raster/loader/Makefile.in	2019-02-11 18:04:19 UTC (rev 17245)
+++ trunk/raster/loader/Makefile.in	2019-02-11 18:42:30 UTC (rev 17246)
@@ -43,7 +43,7 @@
 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

Modified: trunk/raster/rt_core/Makefile.in
===================================================================
--- trunk/raster/rt_core/Makefile.in	2019-02-11 18:04:19 UTC (rev 17245)
+++ trunk/raster/rt_core/Makefile.in	2019-02-11 18:42:30 UTC (rev 17246)
@@ -25,8 +25,8 @@
 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@
 

Modified: trunk/raster/test/cunit/Makefile.in
===================================================================
--- trunk/raster/test/cunit/Makefile.in	2019-02-11 18:04:19 UTC (rev 17245)
+++ trunk/raster/test/cunit/Makefile.in	2019-02-11 18:42:30 UTC (rev 17246)
@@ -21,9 +21,9 @@
 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

Modified: trunk/topology/Makefile.in
===================================================================
--- trunk/topology/Makefile.in	2019-02-11 18:04:19 UTC (rev 17245)
+++ trunk/topology/Makefile.in	2019-02-11 18:42:30 UTC (rev 17246)
@@ -50,7 +50,7 @@
 # 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