[brasero/wip/hadess/add-ci] Revert "more docs stuff"

[Bastien Nocera <hadess src gnome org>]

commit 2feee497cd9181adb5bbad566484f1f488bf8f18
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Sep 9 22:45:10 2021 +0200

    Revert "more docs stuff"
    
    This reverts commit 51151fa96e7cead3f9c73237463bfeb4c90b699c.

 docs/reference/libbrasero-burn/Makefile.am                | 6 +++---
 docs/reference/libbrasero-burn/libbrasero-burn-docs.xml   | 6 +-----
 docs/reference/libbrasero-media/Makefile.am               | 8 ++++----
 docs/reference/libbrasero-media/libbrasero-media-docs.xml | 5 -----
 4 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/docs/reference/libbrasero-burn/Makefile.am b/docs/reference/libbrasero-burn/Makefile.am
index ee385f70..fc99ddab 100644
--- a/docs/reference/libbrasero-burn/Makefile.am
+++ b/docs/reference/libbrasero-burn/Makefile.am
@@ -18,14 +18,14 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=$(top_srcdir)/libbrasero-burn $(top_builddir)/libbrasero-burn
+DOC_SOURCE_DIR=../../../libbrasero-burn
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=--rebuild-types
+SCAN_OPTIONS=
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
@@ -114,7 +114,7 @@ AM_CPPFLAGS=                                                                \
        $(BRASERO_IO_CFLAGS)                                            \
        $(BRASERO_GTK_CFLAGS)
 
-GTKDOC_LIBS=$(top_builddir)/libbrasero-media/libbrasero-media3.la 
$(top_builddir)/libbrasero-burn/libbrasero-burn3.la
+GTKDOC_LIBS=$(top_builddir)/libbrasero-media/libbrasero-media.la 
$(top_builddir)/libbrasero-burn/libbrasero-burn.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/libbrasero-burn/libbrasero-burn-docs.xml 
b/docs/reference/libbrasero-burn/libbrasero-burn-docs.xml
index 10060bc5..873a5497 100644
--- a/docs/reference/libbrasero-burn/libbrasero-burn-docs.xml
+++ b/docs/reference/libbrasero-burn/libbrasero-burn-docs.xml
@@ -37,13 +37,9 @@
     <xi:include href="xml/brasero-tool-dialog.xml"/>
     <xi:include href="xml/brasero-sum-dialog.xml"/>
     <xi:include href="xml/brasero-blank-dialog.xml"/>
-  </chapter>
 
-  <chapter id="object-tree">
-    <title>Object Hierarchy</title>
-     <xi:include href="xml/tree_index.sgml"/>
-  </chapter>
 
+  </chapter>
   <index id="api-index-full">
     <title>API Index</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff --git a/docs/reference/libbrasero-media/Makefile.am b/docs/reference/libbrasero-media/Makefile.am
index ce4302e8..c6e69b63 100644
--- a/docs/reference/libbrasero-media/Makefile.am
+++ b/docs/reference/libbrasero-media/Makefile.am
@@ -18,14 +18,14 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=$(top_srcdir)/libbrasero-media $(top_builddir)/libbrasero-media
+DOC_SOURCE_DIR=../../../libbrasero-media
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=--rebuild-types
+SCAN_OPTIONS=
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
@@ -42,7 +42,7 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/libbrasero-media/*.h $(top_builddir)/libbrasero-media/*.h
+HFILE_GLOB=$(top_srcdir)/libbrasero-media/*.h
 CFILE_GLOB=$(top_srcdir)/libbrasero-media/*.c
 
 # Header files to ignore when scanning.
@@ -111,7 +111,7 @@ AM_CPPFLAGS=                                                                \
        $(BRASERO_IO_CFLAGS)                                            \
        $(BRASERO_GTK_CFLAGS)
 
-GTKDOC_LIBS=$(top_builddir)/libbrasero-media/libbrasero-media3.la
+GTKDOC_LIBS=$(top_builddir)/libbrasero-media/libbrasero-media.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/libbrasero-media/libbrasero-media-docs.xml 
b/docs/reference/libbrasero-media/libbrasero-media-docs.xml
index 5d34b3a9..a89de72b 100644
--- a/docs/reference/libbrasero-media/libbrasero-media-docs.xml
+++ b/docs/reference/libbrasero-media/libbrasero-media-docs.xml
@@ -22,13 +22,8 @@
     <xi:include href="xml/brasero-volume.xml"/>
     <xi:include href="xml/brasero-medium-selection.xml"/>
     <xi:include href="xml/brasero-drive-selection.xml"/>
-  </chapter>
 
-  <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>