Fixes build && distcheck

svn path=/trunk/; revision=3406

diff --git a/Makefile.am b/Makefile.am
index de2524acf236e26f4c233d2365bbe8b5f14c4f56..d3245e2ada11ec38359b870bee882382b554865c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,11 @@ header_DATA = \
 
 intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
 
-EXTRA_DIST = $(intltool_extra) gnome-doc-utils.make MAINTAINERS
+EXTRA_DIST = $(intltool_extra) \
+       gnome-doc-utils.make \
+       MAINTAINERS \
+       evince-document.h \
+       evince-view.h
 
 DISTCLEANFILES =               \
        gnome-doc-utils.make    \

diff --git a/help/reference/libdocument/Makefile.am b/help/reference/libdocument/Makefile.am
index 7290360f0a12041281d52512c51adcd7497f9173..fd3a711129d0fa4c28ca9112fb5d209e46609844 100644 (file)
--- a/help/reference/libdocument/Makefile.am
+++ b/help/reference/libdocument/Makefile.am
@@ -57,7 +57,8 @@ HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
+content_files= \
+       version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files

diff --git a/help/reference/libdocument/libevdocument-docs.sgml b/help/reference/libdocument/libevdocument-docs.sgml
index 53e4ad44aa0c516bc285fa255a9dff3a39bb8661..667c3b1fc4a018c975f0ee54236e323c49e16278 100644 (file)
--- a/help/reference/libdocument/libevdocument-docs.sgml
+++ b/help/reference/libdocument/libevdocument-docs.sgml
@@ -2,8 +2,36 @@
 <!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">
+<!ENTITY version SYSTEM "version.xml">
+<!ENTITY ev-async-renderer SYSTEM "xml/ev-async-renderer.xml">
+<!ENTITY ev-document-find SYSTEM "xml/ev-document-find.xml">
+<!ENTITY ev-document-fonts SYSTEM "xml/ev-document-fonts.xml">
+<!ENTITY ev-document-forms SYSTEM "xml/ev-document-forms.xml">
+<!ENTITY ev-document-images SYSTEM "xml/ev-document-images.xml">
+<!ENTITY ev-document-links SYSTEM "xml/ev-document-links.xml">
+<!ENTITY ev-document-security SYSTEM "xml/ev-document-security.xml">
+<!ENTITY ev-document-thumbnails SYSTEM "xml/ev-document-thumbnails.xml">
+<!ENTITY ev-document-transition SYSTEM "xml/ev-document-transition.xml">
+<!ENTITY ev-file-exporter SYSTEM "xml/ev-file-exporter.xml">
+<!ENTITY ev-document SYSTEM "xml/ev-document.xml">
+<!ENTITY ev-selection SYSTEM "xml/ev-selection.xml">
+<!ENTITY ev-document-layers SYSTEM "xml/ev-document-layers.xml">
+<!ENTITY ev-attachment SYSTEM "xml/ev-attachment.xml">
+<!ENTITY ev-document-info SYSTEM "xml/ev-document-info.xml">
+<!ENTITY ev-form-field SYSTEM "xml/ev-form-field.xml">
+<!ENTITY ev-image SYSTEM "xml/ev-image.xml">
+<!ENTITY ev-link-action SYSTEM "xml/ev-link-action.xml">
+<!ENTITY ev-link-dest SYSTEM "xml/ev-link-dest.xml">
+<!ENTITY ev-link SYSTEM "xml/ev-link.xml">
+<!ENTITY ev-render-context SYSTEM "xml/ev-render-context.xml">
+<!ENTITY ev-layer SYSTEM "xml/ev-layer.xml">
+<!ENTITY ev-page SYSTEM "xml/ev-page.xml">
+<!ENTITY ev-transition-effect SYSTEM "xml/ev-transition-effect.xml">
+<!ENTITY ev-document-factory SYSTEM "xml/ev-document-factory.xml">
+<!ENTITY ev-document-misc SYSTEM "xml/ev-document-misc.xml">
+<!ENTITY ev-file-helpers SYSTEM "xml/ev-file-helpers.xml">
+<!ENTITY ev-backends-manager SYSTEM "xml/ev-backends-manager.xml">
+<!ENTITY ev-init SYSTEM "xml/ev-init.xml">
 ]>
 <book id="index">
   <bookinfo>
@@ -21,19 +49,19 @@
        document interfaces.
       </para>
     </partintro>
-    <xi:include href="xml/ev-async-renderer.xml"/>
-    <xi:include href="xml/ev-document-find.xml"/>
-    <xi:include href="xml/ev-document-fonts.xml"/>
-    <xi:include href="xml/ev-document-forms.xml"/>
-    <xi:include href="xml/ev-document-images.xml"/>
-    <xi:include href="xml/ev-document-links.xml"/>
-    <xi:include href="xml/ev-document-security.xml"/>
-    <xi:include href="xml/ev-document-thumbnails.xml"/>
-    <xi:include href="xml/ev-document-transition.xml"/>
-    <xi:include href="xml/ev-file-exporter.xml"/>
-    <xi:include href="xml/ev-document.xml"/>
-    <xi:include href="xml/ev-selection.xml"/>
-    <xi:include href="xml/ev-document-layers.xml"/>
+    &ev-async-renderer;
+    &ev-document-find;
+    &ev-document-fonts;
+    &ev-document-forms;
+    &ev-document-images;
+    &ev-document-links;
+    &ev-document-security;
+    &ev-document-thumbnails;
+    &ev-document-transition;
+    &ev-file-exporter;
+    &ev-document;
+    &ev-selection;
+    &ev-document-layers;
   </part>
 
   <part id="data">
@@ -44,17 +72,17 @@
        images.
       </para>
     </partintro>
-    <xi:include href="xml/ev-attachment.xml"/>
-    <xi:include href="xml/ev-document-info.xml"/>
-    <xi:include href="xml/ev-form-field.xml"/>
-    <xi:include href="xml/ev-image.xml"/>
-    <xi:include href="xml/ev-link-action.xml"/>
-    <xi:include href="xml/ev-link-dest.xml"/>
-    <xi:include href="xml/ev-link.xml"/>
-    <xi:include href="xml/ev-render-context.xml"/>
-    <xi:include href="xml/ev-layer.xml"/>
-    <xi:include href="xml/ev-page.xml"/>
-    <xi:include href="xml/ev-transition-effect.xml"/>
+    &ev-attachment;
+    &ev-document-info;
+    &ev-form-field;
+    &ev-image;
+    &ev-link-action;
+    &ev-link-dest;
+    &ev-link;
+    &ev-render-context;
+    &ev-layer;
+    &ev-page;
+    &ev-transition-effect;
   </part>
 
   <part id="helper">
@@ -64,11 +92,11 @@
        Helper functions common for backend implementation
       </para>
     </partintro>
-    <xi:include href="xml/ev-document-factory.xml"/>
-    <xi:include href="xml/ev-document-misc.xml"/>
-    <xi:include href="xml/ev-file-helpers.xml"/>
-    <xi:include href="xml/ev-backends-manager.xml"/>
-    <xi:include href="xml/ev-init.xml"/>
+    &ev-document-factory;
+    &ev-document-misc;
+    &ev-file-helpers;
+    &ev-backends-manager;
+    &ev-init;
   </part>
 
 </book>

diff --git a/help/reference/libview/Makefile.am b/help/reference/libview/Makefile.am
index efa94073023816ecd158f116bc8b9d674ebe426d..9adbe24b1aa8a1a3026c1363e05256253f7c8b2b 100644 (file)
--- a/help/reference/libview/Makefile.am
+++ b/help/reference/libview/Makefile.am
@@ -61,7 +61,8 @@ HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
+content_files= \
+       version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files

diff --git a/help/reference/libview/libevview-docs.sgml b/help/reference/libview/libevview-docs.sgml
index ee04d5f50d865ae0810c604cb7bb9b08a958eb98..726a87b7a658de145531db20498d8eaa8984e111 100644 (file)
--- a/help/reference/libview/libevview-docs.sgml
+++ b/help/reference/libview/libevview-docs.sgml
@@ -2,8 +2,11 @@
 <!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">
+    <!ENTITY version SYSTEM "version.xml">
+    <!ENTITY ev-jobs SYSTEM "xml/ev-jobs.xml">
+    <!ENTITY ev-page-cache SYSTEM "xml/ev-page-cache.xml">
+    <!ENTITY ev-view SYSTEM "xml/ev-view.xml">
+    <!ENTITY ev-job-scheduler SYSTEM "xml/ev-job-scheduler.xml">
 ]>
 <book id="index">
   <bookinfo>
@@ -17,9 +20,9 @@
       <para>
       </para>
     </partintro>
-    <xi:include href="xml/ev-jobs.xml"/>
-    <xi:include href="xml/ev-page-cache.xml"/>
-    <xi:include href="xml/ev-view.xml"/>
-    <xi:include href="xml/ev-job-scheduler.xml"/>
+    &ev-jobs;
+    &ev-page-cache;
+    &ev-view;
+    &ev-job-scheduler;
   </chapter>
 </book>