From 375ef4994620dd905484b6f1f139305e56c39106 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sat, 30 Apr 2022 02:10:37 +0200
Subject: [PATCH] Review the documentation generation

This notably fixes "make distcheck".
---
 doc/gtkdoc/CPP-docs.xml | 26 +++++++++++++++++---------
 doc/gtkdoc/project.conf |  2 +-
 doc/project.conf        |  4 ++--
 project.conf            |  4 ++--
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/doc/gtkdoc/CPP-docs.xml b/doc/gtkdoc/CPP-docs.xml
index 9932efa..09b5640 100644
--- a/doc/gtkdoc/CPP-docs.xml
+++ b/doc/gtkdoc/CPP-docs.xml
@@ -3,25 +3,32 @@
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
   <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-  <!ENTITY server "www.defora.org/doc/gtk-doc/html">
-  <!ENTITY title "DeforaOS CPP">
-  <!ENTITY version "0.0.1">
+  <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+  %gtkdocentities;
+  <!ENTITY % configentities SYSTEM "config.ent">
+  %configentities;
 ]>
-<book id="index">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>CPP Reference Manual</title>
+    <title>&vendor; &package; &title;</title>
     <releaseinfo>
-      for CPP &version;.
+      for &vendor; &package; &version;.
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://&server;/CPP/index.html">http://&server;/CPP/</ulink>.
+      <ulink role="online-location" url="https://&server;/&package;/">https://&server;/&package;/</ulink>.
     </releaseinfo>
   </bookinfo>
 
   <chapter>
-    <title>&title;</title>
+    <title>&vendor; &package;</title>
     <xi:include href="xml/CPP.xml"/>
 
   </chapter>
+  <!-- enable this when you use gobject types
+  <chapter id="object-tree">
+    <title>Object Hierarchy</title>
+    <xi:include href="xml/tree_index.sgml"/>
+  </chapter>
+  -->
   <index id="api-index-full">
     <title>API Index</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
@@ -30,6 +37,7 @@
     <title>Index of deprecated API</title>
     <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
   </index>
-
+  <!-- enable this when you use gobject introspection annotations
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+  -->
 </book>
diff --git a/doc/gtkdoc/project.conf b/doc/gtkdoc/project.conf
index 23a8391..3810ee9 100644
--- a/doc/gtkdoc/project.conf
+++ b/doc/gtkdoc/project.conf
@@ -1,2 +1,2 @@
 subdirs=tmpl
-dist=Makefile,CPP-docs.xml
+dist=Makefile,CPP-docs.xml,CPP-sections.txt,xml/gtkdocentities.ent
diff --git a/doc/project.conf b/doc/project.conf
index b11767d..25c1906 100644
--- a/doc/project.conf
+++ b/doc/project.conf
@@ -11,13 +11,13 @@ depends=gtkdoc.sh
 [gtkdoc/html.stamp]
 type=script
 script=./gtkdoc.sh
-depends=gtkdoc/CPP-docs.xml,$(OBJDIR)gtkdoc/xml.stamp,gtkdoc.sh
+depends=gtkdoc/CPP-docs.xml,$(OBJDIR)gtkdoc/xml.stamp,gtkdoc/xml/gtkdocentities.ent,gtkdoc.sh,../config.ent,../config.sh
 install=
 
 [gtkdoc/tmpl.stamp]
 type=script
 script=./gtkdoc.sh
-depends=$(OBJDIR)gtkdoc/CPP.types,gtkdoc/tmpl/cpp.sgml,gtkdoc.sh
+depends=$(OBJDIR)gtkdoc/CPP.types,gtkdoc.sh,../config.sh
 
 [gtkdoc/xml.stamp]
 type=script
diff --git a/project.conf b/project.conf
index b7dcb38..4e43327 100644
--- a/project.conf
+++ b/project.conf
@@ -1,10 +1,10 @@
 package=CPP
 version=0.0.3
-config=h,sh
+config=ent,h,sh
 
 subdirs=data,doc,include,src,tests
 targets=tests
-dist=Makefile,COPYING,config.h,config.sh
+dist=Makefile,COPYING,config.ent,config.h,config.sh
 
 #modes
 [mode::debug]