[postgis-tickets] [SCM] PostGIS branch master updated. 220be347eeb5dea6a4a46f871e87779249353038

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  220be347eeb5dea6a4a46f871e87779249353038 (commit)
      from  2a9e136e0b65d7f8ec194c1ec5479d595c340564 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 220be347eeb5dea6a4a46f871e87779249353038
Author: Raúl Marín <git at rmr.ninja>
Date:   Wed Jan 29 13:33:57 2020 +0100

    Enforce local folders to be included first
    
    References #4626

diff --git a/deps/Makefile.in b/deps/Makefile.in
index 4262f96..14fea56 100644
--- a/deps/Makefile.in
+++ b/deps/Makefile.in
@@ -24,8 +24,8 @@
 
 CC=@CC@
 CXX=@CXX@
-CFLAGS=-I../liblwgeom @WARNFLAGS@ @CFLAGS@ @PICFLAGS@
-CXXFLAGS=-I../liblwgeom @WARNFLAGS@ @CXXFLAGS@ @PICFLAGS@
+CFLAGS=-I../liblwgeom @CPPFLAGS@ @WARNFLAGS@ @CFLAGS@ @PICFLAGS@
+CXXFLAGS=-I../liblwgeom @CPPFLAGS@ @WARNFLAGS@ @CXXFLAGS@ @PICFLAGS@
 LDFLAGS = @LDFLAGS@
 top_builddir = @top_builddir@
 libdir = @libdir@
diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index 9fb00a2..43eccf6 100644
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -175,7 +175,7 @@ images: $(IMAGES) $(IMAGES_RESIZED)
 
 # Command to build each of the .o files
 $(OBJS): %.o: %.c
-	$(CC) $(CFLAGS) $(CUNIT_CPPFLAGS) -c -o $@ $<
+	$(CC) $(CUNIT_CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 # Command to build each of the .wkt files
 $(IMAGES): ../images/%.png: %.wkt generator styles.conf
diff --git a/liblwgeom/cunit/Makefile.in b/liblwgeom/cunit/Makefile.in
index 008821b..3fe9942 100644
--- a/liblwgeom/cunit/Makefile.in
+++ b/liblwgeom/cunit/Makefile.in
@@ -15,7 +15,7 @@ SHELL = @SHELL@
 LIBTOOL = @LIBTOOL@
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I.. @CPPFLAGS@
+CUNIT_CPPFLAGS=-I.. @CUNIT_CPPFLAGS@ @CPPFLAGS@
 CFLAGS=$(CUNIT_CPPFLAGS) @WARNFLAGS@ @CFLAGS@
 LDFLAGS = @GEOS_LDFLAGS@ $(CUNIT_LDFLAGS)
 
diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
index 39fffa0..006bab1 100644
--- a/libpgcommon/Makefile.in
+++ b/libpgcommon/Makefile.in
@@ -62,7 +62,7 @@ check-unit: libpgcommon.a
 
 # Command to build each of the .o files
 $(SA_OBJS): %.o: %.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 $(SA_OBJS): ../postgis_config.h
 
diff --git a/loader/cunit/Makefile.in b/loader/cunit/Makefile.in
index 5c5e983..9e50020 100644
--- a/loader/cunit/Makefile.in
+++ b/loader/cunit/Makefile.in
@@ -16,7 +16,7 @@ SHELL = @SHELL@
 LIBTOOL = @LIBTOOL@
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I.. @CPPFLAGS@
+CUNIT_CPPFLAGS=-I.. @CUNIT_CPPFLAGS@ @CPPFLAGS@
 
 # GTK includes and libraries
 GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@
diff --git a/raster/test/cunit/Makefile.in b/raster/test/cunit/Makefile.in
index fead5c6..98724ce 100644
--- a/raster/test/cunit/Makefile.in
+++ b/raster/test/cunit/Makefile.in
@@ -45,7 +45,7 @@ LDFLAGS = \
 	$(PROJ_LDFLAGS)
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ @CPPFLAGS@ -I..
+CUNIT_CPPFLAGS=-I.. @CUNIT_CPPFLAGS@
 
 # ADD YOUR NEW TEST FILE HERE (1/1)
 OBJS=	\
@@ -84,7 +84,7 @@ cu_tester: $(RT_CORE)/librtcore.a $(OBJS)
 
 # Command to build each of the .o files
 $(OBJS): %.o: %.c
-	$(CC) $(CFLAGS) $(CUNIT_CPPFLAGS) -c -o $@ $<
+	$(CC) $(CUNIT_CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 $(RT_CORE)/librtcore.a:
 	$(MAKE) -C ../../rt_core
diff --git a/topology/Makefile.in b/topology/Makefile.in
index e86fcf1..68ea0bd 100644
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -51,7 +51,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@ @PICFLAGS@
+PG_CPPFLAGS += -I../liblwgeom -I../libpgcommon @CFLAGS@ @CPPFLAGS@ @PICFLAGS@
 SHLIB_LINK_F = ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@
 
 # Add SFCGAL Flags if defined

-----------------------------------------------------------------------

Summary of changes:
 deps/Makefile.in               | 4 ++--
 doc/html/image_src/Makefile.in | 2 +-
 liblwgeom/cunit/Makefile.in    | 2 +-
 libpgcommon/Makefile.in        | 2 +-
 loader/cunit/Makefile.in       | 2 +-
 raster/test/cunit/Makefile.in  | 4 ++--
 topology/Makefile.in           | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
PostGIS