[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1126-gffe3b4b74

[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  ffe3b4b749c8639c2b9d8dc139f5992248e833c1 (commit)
      from  578f3f959dd2ffc38727a15d2ca2ef02226839c1 (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 ffe3b4b749c8639c2b9d8dc139f5992248e833c1
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Jul 5 12:26:40 2023 +0200

    Don't rebuild chunked html if no sources change
    
    Uses docbook.css as a target, meaning chunked html will only be
    rebuilt if docbook.css is missing from target dir or any real
    dependency (xml, Makefile) is newer
    
    Add an html-clean rule to help clean builds

diff --git a/doc/Makefile.in b/doc/Makefile.in
index bfd78fbb5..fb4405f65 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -303,26 +303,29 @@ $(GENERATED_CHEATSHEET_FILES): html/%.html: xsl/%.html.xsl $(XML_INPUTS) postgis
 postgis-out.xml: postgis.xml Makefile
 	$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@
 
-chunked-html: postgis-out.xml Makefile $(XML_INPUTS)
+chunked-html: html/postgis$(DOCSUFFIX)/docbook.css
+html/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
 	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
 		$(XSLTPROC_CHUNKED_HTML_OPTS) \
-		--output html/postgis$(DOCSUFFIX)/ \
+		--output $(dir $@) \
 		$(CHUNK_HTML_DOCBOOK_XSL) \
 		$<
 
-chunked-html-web: postgis-out.xml Makefile $(XML_INPUTS)
+chunked-html-web: html/postgis-web$(DOCSUFFIX)/docbook.css
+html/postgis-web$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
 	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
 		$(XSLTPROC_CHUNKED_HTML_OPTS) \
-		--output html/postgis-web$(DOCSUFFIX)/ \
+		--output $(dir $@) \
 		--stringparam html.script ga.js \
 		$(CHUNK_HTML_DOCBOOK_XSL) \
 		$<
 
 HTML_BITS = $(wildcard html/*.html)
-chunked-html-web-mobile: postgis-out.xml Makefile $(XML_INPUTS)
+chunked-html-web-mobile: html/postgis-web-mobile$(DOCSUFFIX)/docbook.css
+html/postgis-web-mobile$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
 	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
 		$(XSLTPROC_CHUNKED_HTML_OPTS) \
-		--output html/postgis-web-mobile$(DOCSUFFIX)/ \
+		--output $(dir $@) \
 		--stringparam html.script ga.js \
 		$(CHUNK_HTML_DOCBOOK_XSL) \
 		$<
@@ -400,8 +403,13 @@ doxygen: doxygen.cfg
 images images-install images-uninstall images-clean:
 	$(MAKE) -C html/images $@
 
-clean:
-	rm -rf html/postgis-*
+html-clean:
+	rm -f html/postgis$(DOCSUFFIX).html
+	rm -rf html/postgis$(DOCSUFFIX)/
+	rm -rf html/postgis-web$(DOCSUFFIX)/
+	rm -rf html/postgis-web-mobile$(DOCSUFFIX)/
+
+clean: html-clean
 	rm -f *.pdf
 	rm -f *.epub
 	rm -f images # work around https://trac.osgeo.org/postgis/ticket/5422

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

Summary of changes:
 doc/Makefile.in | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS