From 5f880c34c88d5fda851483245b914344e1aa5d4e Mon Sep 17 00:00:00 2001
From: Bert Burgemeister <trebbu@googlemail.com>
Date: Thu, 12 Oct 2017 07:54:49 +0200
Subject: [PATCH] Rearrange Github pages-related Makefile targets

---
 Makefile         | 13 -------------
 Makefile.publish | 12 ++++++++++--
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 9ee24e4..dd6f1eb 100644
--- a/Makefile
+++ b/Makefile
@@ -116,19 +116,6 @@ man-toc:
 man-outline: www-template/outline.xsl gh-pages/pipeglade.1.html
 	@xsltproc --html ${.ALLSRC}
 
-# Our collection of simple test widgets
-examples-list:
-	@ls -1 widget-examples | grep "\.ui$$"
-
 # Items marked done in list of all widgets
 done-list:
 	@awk '!/^#/&&/Gtk[A-Z][a-zA-Z]/&&/done/{print $$1}' buildables.txt
-
-
-# Prepare the www directory
-
-gh-pages: pipeglade pipeglade.1 NEWS LICENSE
-	$(MAKE) "VERSION = $(VERSION)" -f Makefile.publish gh-pages
-
-publish:
-	$(MAKE) "VERSION = $(VERSION)" -f Makefile.publish publish
diff --git a/Makefile.publish b/Makefile.publish
index 0654a37..7a67c91 100644
--- a/Makefile.publish
+++ b/Makefile.publish
@@ -23,6 +23,10 @@
 
 # Prepare the www directory
 
+clean:
+	rm -rf gh-pages
+
+VERSION != (which git >/dev/null && git describe --tags || echo "NONE") | cut -d "-" -f 1
 GH_PAGES_SIMPLE = style.css CNAME README robots.txt
 GH_PAGES_PUBLIC = ${GH_PAGES_SIMPLE} pipeglade.1.html pipeglade.1.pdf clock.jpg clock.ui.txt clock.sh.txt 404.html
 GH_PAGES_TEMP = LICENSE gallery.html index-hrefs
@@ -35,7 +39,7 @@ SNAPSHOTS = ${WIDGETS:C|(.*)|gh-pages/\1.jpg|}
 gh-pages: gh-pages-untested test-index-hrefs
 	rm -f ${GH_PAGES_TEMP:S|^|gh-pages/|}
 
-gh-pages-untested: ${GH_PAGES_PUBLIC:S|^|gh-pages/|} ${SNAPSHOTS} gh-pages/index.html
+gh-pages-untested: ${GH_PAGES_PUBLIC:S|^|gh-pages/|} $(SNAPSHOTS) gh-pages/index.html
 
 .for FILE in ${GH_PAGES_SIMPLE}
 gh-pages/${FILE}: www-template/${FILE}
@@ -52,7 +56,7 @@ gh-pages/index.html: pipeglade gh-pages/pipeglade.1.html www-template/index.html
 	echo -e ',s/_PUT_VERSION_HERE_/$(VERSION)/g\nwq' | ed -s gh-pages/index.html
 	echo -e '/<\/body>/-r www-template/statcounter.html\nwq' | ed -s gh-pages/index.html
 
-gh-pages/LICENSE: LICENSE Makefile
+gh-pages/LICENSE: LICENSE Makefile Makefile.publish
 	@mkdir -p gh-pages
 	sed 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g; s/"/\&quot;/g; s/'"'"'/\&#39;/g; s|^$$|<p/>|g' <LICENSE >${.TARGET}
 
@@ -79,6 +83,10 @@ gh-pages/clock.jpg: clock.svg
 clock.svg: clock.sh clock.ui pipeglade
 	./clock.sh ${.TARGET}
 
+# Our collection of simple test widgets
+examples-list:
+	@ls -1 widget-examples | grep "\.ui$$"
+
 # Screenshots of the widget examples
 
 .for W in ${WIDGETS}
-- 
2.11.4.GIT