[postgis-tickets] [SCM] PostGIS branch out-of-build-docs created. 3.2.0-378-g146820e01

[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, out-of-build-docs has been created
        at  146820e013003c0c2a19a322ae0a1cdf4fcc22ce (commit)

- Log -----------------------------------------------------------------
commit 146820e013003c0c2a19a322ae0a1cdf4fcc22ce
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jan 27 16:59:19 2022 +0100

    Fix out-of-source build of image generator

diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index 1add81ce4..aa71d19d9 100644
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -9,14 +9,18 @@
 # *
 # **********************************************************************
 
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+srcdir = @srcdir@
+
 CC=@CC@
 CFLAGS=@CFLAGS@ @PROJ_CPPFLAGS@
-top_builddir = @top_builddir@
+CPPFLAGS = -I$(top_builddir)/liblwgeom -I$(top_srcdir)/liblwgeom @CPPFLAGS@
 SHELL = @SHELL@
 LIBTOOL = @LIBTOOL@
+LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ @PROJ_LDFLAGS@
 
-CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=-I../../../liblwgeom @CUNIT_CPPFLAGS@
+VPATH = $(srcdir)
 
 IMAGES= \
 	../images/de9im01.png \
@@ -182,7 +186,7 @@ images: $(IMAGES) $(IMAGES_RESIZED)
 
 # Command to build each of the .o files
 $(OBJS): %.o: %.c
-	$(CC) $(CUNIT_CPPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 # Command to build each of the .wkt files
 $(IMAGES): ../images/%.png: %.wkt generator styles.conf
@@ -194,9 +198,9 @@ $(IMAGES_RESIZED): ../images/%.png: %.wkt generator styles.conf
 	convert $@ -resize 100x100 $@
 
 # Build the main executable
-generator: ../../../liblwgeom/.libs/liblwgeom.a $(OBJS)
+generator: $(OBJS) ../../../liblwgeom/.libs/liblwgeom.a
 	$(LIBTOOL) --mode=link \
-	$(CC) -o $@ $(OBJS) ../../../liblwgeom/liblwgeom.la $(CUNIT_LDFLAGS)
+	$(CC) -o $@ $^ $(LDFLAGS)
 
 # Build liblwgeom
 ../../../liblwgeom/.libs/liblwgeom.a:

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


hooks/post-receive
-- 
PostGIS