[postgis-tickets] [SCM] PostGIS branch stable-2.5 updated. 2.5.4-4-gc61f410

[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-2.5 has been updated
       via  c61f4107dad832da8322a4314106abd1769e6724 (commit)
      from  cf21eefc290841a88e7850345521bebbbfdc96bf (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 c61f4107dad832da8322a4314106abd1769e6724
Author: Raúl Marín <git at rmr.ninja>
Date:   Fri Mar 6 14:12:55 2020 +0100

    Backport raster cunit Makefile changes

diff --git a/raster/test/cunit/Makefile.in b/raster/test/cunit/Makefile.in
index 4124c63..24dfa4e 100644
--- a/raster/test/cunit/Makefile.in
+++ b/raster/test/cunit/Makefile.in
@@ -24,18 +24,22 @@ PROJ_CFLAGS=@PROJ_CPPFLAGS@
 PROJ_LDFLAGS=@PROJ_LDFLAGS@ -lproj
 GEOS_CFLAGS=@GEOS_CPPFLAGS@
 GEOS_LDFLAGS=@GEOS_LDFLAGS@ -lgeos_c
+CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
 
 RTCORE_CFLAGS=-I$(RT_CORE)
 RTCORE_LDFLAGS=$(RT_CORE)/librtcore.a
 
 CC=@CC@
 CFLAGS = \
-	@CFLAGS@ @WARNFLAGS@ \
+	-I.. \
+	$(LIBLWGEOM_CFLAGS) \
 	$(RTCORE_CFLAGS) \
 	$(LIBLWGEOM_CFLAGS) \
 	$(PROJ_CFLAGS) \
 	$(LIBGDAL_CFLAGS) \
-	$(GEOS_CFLAGS)
+	$(GEOS_CFLAGS) \
+	@CUNIT_CPPFLAGS@ \
+	@WARNFLAGS@ @CFLAGS@
 
 LDFLAGS = \
 	$(RTCORE_LDFLAGS) \
@@ -43,10 +47,8 @@ LDFLAGS = \
 	$(LIBGDAL_LDFLAGS) \
 	$(GEOS_LDFLAGS) \
 	$(PROJ_LDFLAGS) \
-	-lm \
+	-lm
 
-CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I..
 
 # ADD YOUR NEW TEST FILE HERE (1/1)
 OBJS=	\
@@ -62,7 +64,7 @@ OBJS=	\
 	cu_spatial_relationship.o \
 	cu_mapalgebra.o \
 	cu_misc.o \
-	cu_tester.o 
+	cu_tester.o
 
 # If we couldn't find the cunit library then display a helpful message
 ifeq ($(CUNIT_LDFLAGS),)
@@ -85,7 +87,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) $(CFLAGS) -c -o $@ $<
 
 $(RT_CORE)/librtcore.a:
 	$(MAKE) -C ../../rt_core

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

Summary of changes:
 raster/test/cunit/Makefile.in | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
PostGIS