From dd82d79e748e8ddc0c4fa6240d9e1f16765a51e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Mar=C3=ADn=20Rodr=C3=ADguez?= Date: Thu, 29 Nov 2018 09:19:57 +0000 Subject: [PATCH] Include liblwgeom first Ported from r16813 (2.5) References #4180 References #4260 git-svn-id: http://svn.osgeo.org/postgis/trunk@17084 b70326c6-7e19-0410-871a-916f4a2858ee --- doc/html/image_src/Makefile.in | 2 +- raster/rt_pg/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in index 88e0432bf..243fd43c4 100644 --- a/doc/html/image_src/Makefile.in +++ b/doc/html/image_src/Makefile.in @@ -16,7 +16,7 @@ SHELL = @SHELL@ LIBTOOL = @LIBTOOL@ CUNIT_LDFLAGS=@CUNIT_LDFLAGS@ -CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I../../../liblwgeom +CUNIT_CPPFLAGS=-I../../../liblwgeom @CUNIT_CPPFLAGS@ IMAGES= \ ../images/de9im01.png \ diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in index 81113654f..587699c54 100644 --- a/raster/rt_pg/Makefile.in +++ b/raster/rt_pg/Makefile.in @@ -76,7 +76,7 @@ LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@ LIBPROJ_CFLAGS=@PROJ_CPPFLAGS@ CC = @CC@ -PG_CPPFLAGS+= @CPPFLAGS@ @CFLAGS@ $(LIBGDAL_CFLAGS) $(LIBLWGEOM_CFLAGS) $(LIBPGCOMMON_CFLAGS) $(LIBPROJ_CFLAGS) -I../rt_core +PG_CPPFLAGS+= $(LIBLWGEOM_CFLAGS) @CPPFLAGS@ @CFLAGS@ $(LIBGDAL_CFLAGS) $(LIBPGCOMMON_CFLAGS) $(LIBPROJ_CFLAGS) -I../rt_core SHLIB_LINK_F = ../rt_core/librtcore.a $(LIBLWGEOM_LDFLAGS) $(LIBPGCOMMON_LDFLAGS) $(LIBGDAL_LDFLAGS) @SHLIB_LINK@ # Extra files to remove during 'make clean' -- 2.40.0