Makefile, mkdeps.sh: Derive index.html and feed.xml from more static "sortdata.txt" files

1 files changed, 8 insertions, 9 deletions

diff --git a/mkdeps.sh b/mkdeps.sh
index 8815426..35c2c5c 100755
--- a/mkdeps.sh
+++ b/mkdeps.sh
@@ -58,7 +58,6 @@ 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/'
 
@@ -76,13 +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: deps.mk\n' "$c"
+	printf '\tprintf %s $(articles.%s.sortdata) > $@\n\n' \
+		"'%s\n'" "$name"
 
-	printf '%s/index.htmldeps %s/feed.xmldeps: $(articles.%s.sortdata)\n' \
-		"$c" "$c" "$name"
-	printf '\t@echo %s# find ... > $@.' "'"
-	printf '  Use -n of make(1) for full listing.%s\n' "'"
-	printf '\t@find $(articles.%s.sortdata) > $@\n\n' "$name"
-	printf '%s/feed.xml:\t%s/feed.xmldeps\n' "$c" "$c"
+	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.htmllisting:\t$(articles.%s.indexentry)\n' "$c" "$name"
+	printf '%s/feed.xml:\t$(articles.%s.feedentry)\n' "$c" "$name"
 done