diff options
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | deps.mk | 2 | ||||
| -rwxr-xr-x | mkdeps.sh | 24 |
3 files changed, 22 insertions, 22 deletions
@@ -75,7 +75,7 @@ all: include deps.mk -sources.adoc = $(articles.adoc) $(listings.adoc) $(pages.adoc) +sources.adoc = $(articles.adoc) $(indexes.adoc) $(pages.adoc) sources.htmlbody = $(sources.adoc:.adoc=.htmlbody) sources.html = $(sources.adoc:.adoc=.html) sources.snippets = $(sources.adoc:.adoc=.snippets) @@ -87,10 +87,10 @@ articles.indexentry = $(articles.adoc:.adoc=.indexentry) articles.feedentry = $(articles.adoc:.adoc=.feedentry) articles.sortdata = $(articles.adoc:.adoc=.sortdata) articles.categorydata = $(articles.adoc:.adoc=.categorydata) -listings.htmlheader = $(listings.adoc:.adoc=.htmlheader) -listings.htmlfooter = $(listings.adoc:.adoc=.htmlfooter) -listings.htmllisting = $(listings.adoc:.adoc=.htmllisting) -listings.html = $(listings.adoc:.adoc=.html) +indexes.htmlheader = $(indexes.adoc:.adoc=.htmlheader) +indexes.htmlfooter = $(indexes.adoc:.adoc=.htmlfooter) +indexes.htmllisting = $(indexes.adoc:.adoc=.htmllisting) +indexes.html = $(indexes.adoc:.adoc=.html) categories.xml = $(categories.txt:.txt=.xml) categories.xml.gz = $(categories.txt:.txt=.xml.gz) @@ -156,9 +156,9 @@ derived-assets = \ src/dyn.conf \ src/base.conf \ src/global.conf \ - $(listings.htmlheader) \ - $(listings.htmlfooter) \ - $(listings.htmllisting) \ + $(indexes.htmlheader) \ + $(indexes.htmlfooter) \ + $(indexes.htmllisting) \ $(articles.indexentry) \ $(articles.feedentry) \ $(articles.sortdata) \ @@ -218,7 +218,7 @@ src/base.conf: src/dyn.conf src/static.conf src/global.conf: src/base.conf mkwb conf -G src/base.conf > $@ -$(listings.html): +$(indexes.html): cat $*.htmlheader $*.htmllisting $*.htmlbody $*.htmlfooter > $@ $(categories.txt): @@ -68,7 +68,7 @@ articles.adoc = \ src/content/tils/2021/07/23/git-tls-gpg.adoc \ src/content/tils/2021/08/11/js-bigint-reviver.adoc \ -listings.adoc = \ +indexes.adoc = \ src/content/blog/index.adoc \ src/content/pastebins/index.adoc \ src/content/podcasts/index.adoc \ @@ -16,7 +16,7 @@ articles() { find src/collections/*/*/ -type f -name '*.adoc' | normalize } -listings() { +indexes() { find src/collections/*/index.adoc | normalize } @@ -30,24 +30,24 @@ extras() { files() { pages articles - listings + indexes } pages | varlist 'pages.adoc' articles | varlist 'articles.adoc' -listings | varlist 'listings.adoc' -listings | sed 's|/index\.adoc$|/categories.txt|' | varlist 'categories.txt' -listings | sed 's|/index\.adoc$|/feed.xml|' | varlist 'feeds.xml' +indexes | varlist 'indexes.adoc' +indexes | sed 's|/index\.adoc$|/categories.txt|' | varlist 'categories.txt' +indexes | sed 's|/index\.adoc$|/feed.xml|' | varlist 'feeds.xml' find src/content/img/ -name '*.svg' | varlist 'images.svg' extras | varlist 'sources.extras' { - files | sed 's/^\(.*\)\.adoc$/\1.html/' - files | sed 's/^\(.*\)\.adoc$/\1.snippets/' - listings | sed 's|^\(.*\)/index\.adoc$|\1/categories.xml|' - listings | sed 's|^\(.*\)/index\.adoc$|\1/feed.xml|' + files | sed 's/^\(.*\)\.adoc$/\1.html/' + files | sed 's/^\(.*\)\.adoc$/\1.snippets/' + indexes | sed 's|^\(.*\)/index\.adoc$|\1/categories.xml|' + indexes | sed 's|^\(.*\)/index\.adoc$|\1/feed.xml|' } | sed 's/^\(.*\)$/\1.gz:\t\1/' printf '\n' @@ -65,9 +65,9 @@ articles | sed 's/^\(.*\)\.adoc$/\1.sortdata:\t\1.conf/' articles | sed 's/^\(.*\)\.adoc$/\1.categorydata:\t\1.conf/' printf '\n' -listings | sed 's/^\(.*\)\.adoc$/\1.htmlheader\t\1.htmlfooter:\t\1.conf/' -listings | sed 's/^\(.*\)\.adoc$/\1.html:\t\1.htmlheader\t\1.htmlfooter/' -listings | sed 's/^\(.*\)\.adoc$/\1.html:\t\1.htmllisting\t\1.htmlbody/' +indexes | sed 's/^\(.*\)\.adoc$/\1.htmlheader\t\1.htmlfooter:\t\1.conf/' +indexes | sed 's/^\(.*\)\.adoc$/\1.html:\t\1.htmlheader\t\1.htmlfooter/' +indexes | sed 's/^\(.*\)\.adoc$/\1.html:\t\1.htmllisting\t\1.htmlbody/' printf '\n' for colllink in src/collections/*; do |