Trim edges; simplify

4 files changed, 21 insertions, 38 deletions

diff --git a/.gitignore b/.gitignore
index 563ca1e..d457578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,15 @@
-/src/content/*/*/*/*/*.htmlbody
-/src/content/*/*/*/*/*.conf
-/src/content/*/*/*/*/*.snippets
-/src/content/*/*/*/*/*.html
-/src/content/*/*/*/*/*.txt
-/src/content/*/*/*/*/*.indexentry
-/src/content/*/*/*/*/*.feedentry
-/src/content/*/*/*/*/*.sortdata
-/src/content/*/index.htmlbody
-/src/content/*/index.htmlheader
-/src/content/*/index.htmlfooter
-/src/content/*/index.htmllisting
-/src/content/*/index.htmldeps
-/src/content/*/index.conf
-/src/content/*/index.snippets
-/src/content/*/index.html
-/src/content/*/index.html.*.txt
-/src/content/*/feed.xmldeps
-/src/content/*/feed.xml
-/src/content/*/*.sortdata
-/src/content/*.htmlbody
-/src/content/*.conf
-/src/content/*.snippets
-/src/content/*.html
-/src/content/*.txt
+*.htmlbody
+*.conf
+*.snippets
+*.html
+*.html.*.txt
+*.indexentry
+*.feedentry
+*.sortdata
+index.htmlheader
+index.htmlfooter
+index.htmllisting
+index.htmldeps
+feed.xmldeps
+feed.xml
 /src/global.conf
diff --git a/Makefile b/Makefile
index 4a2a8cf..da5197b 100644
--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,8 @@ $(listings.html):
 $(feeds.xml):
 	mkwb feed src/global.conf $*.xmldeps > $@
 
+
+
 check-unit:
 
 
diff --git a/deps.mk b/deps.mk
index 6077fdc..19015f3 100644
--- a/deps.mk
+++ b/deps.mk
@@ -77,10 +77,7 @@ articles.blog.adoc = \
 	src/content/blog/2000/01/01/feature-ann.adoc \
 
 articles.blog.sortdata = $(articles.blog.adoc:.adoc=.sortdata)
-src/content/blog/index.htmldeps: $(articles.blog.sortdata)
-	find $(articles.blog.sortdata) > $@
-
-src/content/blog/feed.xmldeps:   $(articles.blog.sortdata)
+src/content/blog/index.htmldeps src/content/blog/feed.xmldeps: $(articles.blog.sortdata)
 	find $(articles.blog.sortdata) > $@
 
 src/content/blog/feed.xml:	src/content/blog/feed.xmldeps
@@ -90,10 +87,7 @@ articles.incidents.adoc = \
 	src/content/incidents/2000/01/01/service-start.adoc \
 
 articles.incidents.sortdata = $(articles.incidents.adoc:.adoc=.sortdata)
-src/content/incidents/index.htmldeps: $(articles.incidents.sortdata)
-	find $(articles.incidents.sortdata) > $@
-
-src/content/incidents/feed.xmldeps:   $(articles.incidents.sortdata)
+src/content/incidents/index.htmldeps src/content/incidents/feed.xmldeps: $(articles.incidents.sortdata)
 	find $(articles.incidents.sortdata) > $@
 
 src/content/incidents/feed.xml:	src/content/incidents/feed.xmldeps
diff --git a/mkdeps.sh b/mkdeps.sh
index 287b898..5794ce6 100755
--- a/mkdeps.sh
+++ b/mkdeps.sh
@@ -52,8 +52,7 @@ listings | sed 's/^\(.*\)\.adoc$/\1.html:\t\1.htmllisting\t\1.htmlbody/'
 for colllink in src/collections/*; do
 	c="$(printf '%s' "$colllink" | normalize)"
 
-	printf '\n'
-	printf '\n'
+	printf '\n\n'
 	name="$(basename "$c")"
 	find "$c"/*/ -type f -name '*.adoc' | varlist "articles.$name.adoc"
 	printf \
@@ -61,9 +60,8 @@ for colllink in src/collections/*; do
 		"$name" "$name"
 
 
-	printf '%s/index.htmldeps: $(articles.%s.sortdata)\n' "$c" "$name"
-	printf '\tfind $(articles.%s.sortdata) > $@\n\n' "$name"
-	printf '%s/feed.xmldeps:   $(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"
 done