Commit e597cf03 authored by Raúl Marín's avatar Raúl Marín

Only use configure variables to pass ldflags

Closes #4318


git-svn-id: http://svn.osgeo.org/postgis/trunk@17246 b70326c6-7e19-0410-871a-916f4a2858ee
parent 60403879
Pipeline #47058191 passed with stage
in 32 minutes and 5 seconds
......@@ -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@
......
......@@ -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)
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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@
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment