Makefile: Generate .gz files and update to newer mkwb

1 files changed, 15 insertions, 7 deletions

diff --git a/mkdeps.sh b/mkdeps.sh
index 2b5bc0f..e9141f9 100755
--- a/mkdeps.sh
+++ b/mkdeps.sh
@@ -24,6 +24,8 @@ listings() {
 
 extras() {
 	find src/content/ -type f \
+		-name '*.flac' -or \
+		-name '*.webm' -or \
 		-name '*.tar.gz'
 }
 
@@ -46,12 +48,16 @@ files    | sed 's/^\(.*\)\.adoc$/\1.htmlbody\t\1.snippets\t\1.conf:\t\1.adoc/'
 files    | sed 's/^\(.*\)\.adoc$/\1.html:\t\1.conf\t\1.htmlbody/'
 printf '\n'
 
+files    | sed 's/^\(.*\)\.adoc$/\1.html.gz:\t\1.html/'
+files    | sed 's/^\(.*\)\.adoc$/\1.snippets.gz:\t\1.snippets/'
+listings | sed 's|^\(.*\)/index\.adoc$|\1/feed.xml.gz:\t\1/feed.xml|'
+printf '\n'
+
 articles | sed 's/^\(.*\)\.adoc$/\1.feedentry:\t\1.conf\t\1.htmlbody/'
 articles | sed 's/^\(.*\)\.adoc$/\1.sortdata:\t\1.conf/'
 printf '\n'
 
 listings | sed 's/^\(.*\)\.adoc$/\1.htmlheader\t\1.htmlfooter:\t\1.conf/'
-listings | sed 's/^\(.*\)\.adoc$/\1.htmllisting:\t\1.htmldeps/'
 listings | sed 's/^\(.*\)\.adoc$/\1.html:\t\1.htmlheader\t\1.htmlfooter/'
 listings | sed 's/^\(.*\)\.adoc$/\1.html:\t\1.htmllisting\t\1.htmlbody/'
 
@@ -69,11 +75,13 @@ for colllink in src/collections/*; do
 		"$name" 'feedentry ' "$name" 'feedentry'
 
 
-	printf '%s/index.htmldeps: $(articles.%s.indexentry)\n' "$c" "$name"
-	printf '%s/feed.xmldeps:   $(articles.%s.feedentry)\n'  "$c" "$name"
+	printf '%s/sortdata.txt:\tdeps.mk\n' "$c"
+	printf '\tprintf %s $(articles.%s.sortdata) > $@\n\n' \
+		"'%s\n'" "$name"
+
+	printf '%s/feed.xml\t%s/index.htmllisting:' "$c" "$c"
+	printf '\t%s/sortdata.txt\t$(articles.%s.sortdata)\n' "$c" "$name"
 
-	printf '%s/index.htmldeps %s/feed.xmldeps: $(articles.%s.sortdata)\n' \
-		"$c" "$c" "$name"
-	printf '\tfind $(articles.%s.sortdata) > $@\n\n' "$name"
-	printf '%s/feed.xml:\t%s/feed.xmldeps\n' "$c" "$c"
+	printf '%s/index.htmllisting:\t$(articles.%s.indexentry)\n' "$c" "$name"
+	printf '%s/feed.xml:\t$(articles.%s.feedentry)\n' "$c" "$name"
 done