From fe9368b2f810c2f2d869abbe2e73b8eff090ca78 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Mon, 14 Apr 2025 13:05:29 -0300
Subject: mkdeps.sh, Makefile: Fix generation of correct categories.htmllisting
 files

---
 Makefile | 50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7aea2f9..6eebe56 100644
--- a/Makefile
+++ b/Makefile
@@ -75,26 +75,27 @@ all:
 include deps.mk
 
 
-listings.adoc         = $(categories.adoc) $(indexes.adoc)
-sources.adoc          = $(articles.adoc) $(listings.adoc) $(pages.adoc)
-sources.htmlbody      = $(sources.adoc:.adoc=.htmlbody)
-sources.html          = $(sources.adoc:.adoc=.html)
-sources.snippets      = $(sources.adoc:.adoc=.snippets)
-sources.snippets.gz   = $(sources.adoc:.adoc=.snippets.gz)
-sources.conf          = $(sources.adoc:.adoc=.conf)
-sources.links         = $(sources.adoc:.adoc=.links)
-sources.caslinks      = $(sources.adoc:.adoc=.caslinks)
-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)
-categories.txt        = $(categories.adoc:.adoc=.txt)
-categories.xml        = $(categories.adoc:.adoc=.xml)
-categories.xml.gz     = $(categories.adoc:.adoc=.xml.gz)
+listings.adoc          = $(categories.adoc) $(indexes.adoc)
+sources.adoc           = $(articles.adoc) $(listings.adoc) $(pages.adoc)
+sources.htmlbody       = $(sources.adoc:.adoc=.htmlbody)
+sources.html           = $(sources.adoc:.adoc=.html)
+sources.snippets       = $(sources.adoc:.adoc=.snippets)
+sources.snippets.gz    = $(sources.adoc:.adoc=.snippets.gz)
+sources.conf           = $(sources.adoc:.adoc=.conf)
+sources.links          = $(sources.adoc:.adoc=.links)
+sources.caslinks       = $(sources.adoc:.adoc=.caslinks)
+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)
+categories.htmllisting = $(categories.adoc:.adoc=.htmllisting)
+categories.txt         = $(categories.adoc:.adoc=.txt)
+categories.xml         = $(categories.adoc:.adoc=.xml)
+categories.xml.gz      = $(categories.adoc:.adoc=.xml.gz)
 
 sources = \
 	$(sources.adoc)                          \
@@ -158,13 +159,13 @@ derived-assets = \
 	src/dyn.conf                             \
 	src/base.conf                            \
 	src/global.conf                          \
-	$(listings.htmlheader)                   \
-	$(listings.htmlfooter)                   \
-	$(listings.htmllisting)                  \
 	$(articles.indexentry)                   \
 	$(articles.feedentry)                    \
 	$(articles.sortdata)                     \
 	$(articles.categorydata)                 \
+	$(listings.htmlheader)                   \
+	$(listings.htmlfooter)                   \
+	$(listings.htmllisting)                  \
 	$(categories.txt)                        \
 	$(categories.xml)                        \
 	$(categories.xml.gz)                     \
@@ -223,6 +224,9 @@ src/global.conf: src/base.conf
 $(listings.html):
 	cat $*.htmlheader $*.htmllisting $*.htmlbody $*.htmlfooter > $@
 
+$(categories.htmllisting):
+	mkwb categoriesbody $*.conf > $@
+
 $(categories.txt):
 	mkwb categories $(@D) > $@
 
-- 
cgit v1.2.3