[postgis-tickets] [SCM] PostGIS branch stable-3.0 updated. 85fd73f570544e6ea9f62b08bc46214aff018ee1

[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, stable-3.0 has been updated
       via  85fd73f570544e6ea9f62b08bc46214aff018ee1 (commit)
      from  ffe43e32af0c7b013343426d7ea457cc7902ea7b (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 85fd73f570544e6ea9f62b08bc46214aff018ee1
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
    
    Backports to 3.0 the fixes related to #4626

diff --git a/deps/Makefile.in b/deps/Makefile.in
index abc90af..214c3fa 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 4809f3a..7c53bd7 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 9af41d7..e3c5fe3 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) -lm
 
diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
index ecd55e2..c44cf5b 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 345bfe8..fe0a35c 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..
+CUNIT_CPPFLAGS=-I.. @CUNIT_CPPFLAGS@ @CPPFLAGS@
 
 # GTK includes and libraries
 GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@
@@ -93,7 +93,7 @@ $(OBJS): %.o: %.c
 # Clean target
 clean:
 	rm -f $(OBJS)
-	rm -f cu_tester.exe
+	rm -f cu_tester
 
 distclean: clean
 	rm -f Makefile
diff --git a/raster/test/cunit/Makefile.in b/raster/test/cunit/Makefile.in
index f5f00a9..6571386 100644
--- a/raster/test/cunit/Makefile.in
+++ b/raster/test/cunit/Makefile.in
@@ -30,12 +30,12 @@ RTCORE_LDFLAGS=$(RT_CORE)/librtcore.a
 
 CC=@CC@
 CFLAGS = \
-	@WARNFLAGS@ @CFLAGS@ \
-	$(RTCORE_CFLAGS) \
 	$(LIBLWGEOM_CFLAGS) \
+	$(RTCORE_CFLAGS) \
 	$(PROJ_CFLAGS) \
 	$(LIBGDAL_CFLAGS) \
-	$(GEOS_CFLAGS)
+	$(GEOS_CFLAGS) \
+	@WARNFLAGS@ @CFLAGS@ \
 
 LDFLAGS = \
 	$(RTCORE_LDFLAGS) \
@@ -46,7 +46,7 @@ LDFLAGS = \
 	-lm \
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I..
+CUNIT_CPPFLAGS=-I.. @CUNIT_CPPFLAGS@
 
 # ADD YOUR NEW TEST FILE HERE (1/1)
 OBJS=	\
@@ -85,7 +85,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 7660b7a..8889d47 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       |  4 ++--
 raster/test/cunit/Makefile.in  | 10 +++++-----
 topology/Makefile.in           |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
PostGIS