From: Kay Sievers <kay@vrfy.org>
Date: Sat, 14 Apr 2012 18:47:47 +0000 (+0200)
Subject: doc: silent man page generation and fix gtk-doc warnings
X-Git-Tag: v8~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=471a7d00893809be2bff6cd6cea83666fd4158af;p=thirdparty%2Fkmod.git

doc: silent man page generation and fix gtk-doc warnings
---

diff --git a/libkmod/docs/libkmod-docs.xml b/libkmod/docs/libkmod-docs.xml
index 8a8f139e..fd17506c 100644
--- a/libkmod/docs/libkmod-docs.xml
+++ b/libkmod/docs/libkmod-docs.xml
@@ -3,6 +3,7 @@
                "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 version SYSTEM "version.xml">
 ]>
 <book id="index">
   <bookinfo>
@@ -17,20 +18,10 @@
     <xi:include href="xml/libkmod-config.xml"/>
     <xi:include href="xml/libkmod-module.xml"/>
     <xi:include href="xml/libkmod-loaded.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>
   </index>
-  <index id="deprecated-api-index" role="deprecated">
-    <title>Index of deprecated API</title>
-    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
-  </index>
-
-  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index 8cb86034..f5384a7b 100644
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -577,7 +577,7 @@ KMOD_EXPORT int kmod_module_unref_list(struct kmod_list *list)
  * @input: list of kmod_module to be filtered with blacklist
  * @output: where to save the new list
  *
- * Deprecated: Use kmod_module_apply_filter instead.
+ * This function should not be used. Use kmod_module_apply_filter instead.
  *
  * Given a list @input, this function filter it out with config's blacklist
  * and save it in @output.
diff --git a/man/Makefile.am b/man/Makefile.am
index 772ff7fb..6ab36c1e 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST = $(MAN5:%.5=%.xml) $(MAN8:%.8=%.xml)
 
 XSLTPROC_FLAGS = \
 	--nonet \
+	--stringparam man.output.quietly 1 \
 	--param funcsynopsis.style "'ansi'"
 
 CLEANFILES = $(dist_man_MANS)