From bd6e31c485cd84746f474a64a63c15a7ea87d650 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Wed, 3 Apr 2013 10:19:11 +0200
Subject: Fix documentation so it builds out of tree

---
 doc/manual/Makefile.am       |  7 +++++--
 doc/manual/p11-kit-docs.sgml | 42 ------------------------------------------
 doc/manual/p11-kit-docs.xml  | 42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 44 deletions(-)
 delete mode 100644 doc/manual/p11-kit-docs.sgml
 create mode 100644 doc/manual/p11-kit-docs.xml

(limited to 'doc')

diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 59c8624..79e9e4a 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -9,13 +9,13 @@ AUTOMAKE_OPTIONS = 1.6
 DOC_MODULE=p11-kit
 
 # The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 
 # The directory containing the source code. Relative to $(srcdir).
 # 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=../../p11-kit
+DOC_SOURCE_DIR=$(top_srcdir)/p11-kit
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS= --version
@@ -32,6 +32,8 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
 MKTMPL_OPTIONS=
 
+# MKHTML_OPTIONS=--path="$(builddir)/html $(srcdir)/html"
+
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
 FIXXREF_OPTIONS=
@@ -69,6 +71,7 @@ content_files=p11-kit-config.xml p11-kit-sharing.xml \
 	p11-kit-devel.xml \
 	p11-kit-trust.xml \
 	p11-kit.xml \
+	pkcs11.conf.xml \
 	annotation-glossary.xml \
 	$(NULL)
 
diff --git a/doc/manual/p11-kit-docs.sgml b/doc/manual/p11-kit-docs.sgml
deleted file mode 100644
index 0397169..0000000
--- a/doc/manual/p11-kit-docs.sgml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "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>
-		<title>p11-kit</title>
-		<releaseinfo>for p11-kit &version;</releaseinfo>
-	</bookinfo>
-
-	<xi:include href="p11-kit-config.xml"/>
-	<xi:include href="p11-kit-sharing.xml"/>
-	<xi:include href="p11-kit-trust.xml"/>
-
-	<chapter xml:id="tools">
-		<title>Manual Pages</title>
-		<xi:include href="p11-kit.xml"/>
-		<xi:include href="pkcs11.conf.xml"/>
-	</chapter>
-
-	<chapter xml:id="reference">
-		<title>API Reference</title>
-		<xi:include href="xml/p11-kit.xml"/>
-		<xi:include href="xml/p11-kit-uri.xml"/>
-		<xi:include href="xml/p11-kit-pin.xml"/>
-		<xi:include href="xml/p11-kit-util.xml"/>
-		<xi:include href="xml/p11-kit-future.xml"/>
-
-		<index id="api-index-full">
-			<title>API Index</title>
-			<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
-		</index>
-
-		<xi:include href="annotation-glossary.xml"/>
-	</chapter>
-
-	<xi:include href="p11-kit-devel.xml"/>
-
-</book>
diff --git a/doc/manual/p11-kit-docs.xml b/doc/manual/p11-kit-docs.xml
new file mode 100644
index 0000000..0397169
--- /dev/null
+++ b/doc/manual/p11-kit-docs.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "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>
+		<title>p11-kit</title>
+		<releaseinfo>for p11-kit &version;</releaseinfo>
+	</bookinfo>
+
+	<xi:include href="p11-kit-config.xml"/>
+	<xi:include href="p11-kit-sharing.xml"/>
+	<xi:include href="p11-kit-trust.xml"/>
+
+	<chapter xml:id="tools">
+		<title>Manual Pages</title>
+		<xi:include href="p11-kit.xml"/>
+		<xi:include href="pkcs11.conf.xml"/>
+	</chapter>
+
+	<chapter xml:id="reference">
+		<title>API Reference</title>
+		<xi:include href="xml/p11-kit.xml"/>
+		<xi:include href="xml/p11-kit-uri.xml"/>
+		<xi:include href="xml/p11-kit-pin.xml"/>
+		<xi:include href="xml/p11-kit-util.xml"/>
+		<xi:include href="xml/p11-kit-future.xml"/>
+
+		<index id="api-index-full">
+			<title>API Index</title>
+			<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+		</index>
+
+		<xi:include href="annotation-glossary.xml"/>
+	</chapter>
+
+	<xi:include href="p11-kit-devel.xml"/>
+
+</book>
-- 
cgit v1.1