[evolution-data-server] Make file references in sgml files source-dir capable



commit d5317f7014442dfb4cd9002725e3875066ddc668
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jun 23 18:38:14 2014 +0200

    Make file references in sgml files source-dir capable
    
    The file references were written as relative paths, which doesn't
    work when the build directory isn't the same as the source directory.
    This is the case during 'make distcheck'.

 docs/reference/eds/Makefile.am                     |    9 ++++++-
 ...sor-example.sgml => eds-cursor-example.sgml.in} |   20 ++++-----------
 docs/reference/private/Makefile.am                 |   10 +++++++
 ...ate-docs.sgml => libedbus-private-docs.sgml.in} |   26 ++++++++++----------
 4 files changed, 36 insertions(+), 29 deletions(-)
---
diff --git a/docs/reference/eds/Makefile.am b/docs/reference/eds/Makefile.am
index 03ca06e..f192230 100644
--- a/docs/reference/eds/Makefile.am
+++ b/docs/reference/eds/Makefile.am
@@ -138,13 +138,20 @@ GTKDOC_LIBS = \
        $(CAMEL_LIBS) $(E_DATA_SERVER_LIBS) $(E_BACKEND_LIBS)                   \
        $(EVOLUTION_ADDRESSBOOK_LIBS) $(EVOLUTION_CALENDAR_LIBS)
 
+eds-cursor-example.sgml: eds-cursor-example.sgml.in
+       sed -e 's|\ SRCDIR\@|$(abs_top_srcdir)|g' $< > $(@)
+
+BUILT_SOURCES = eds-cursor-example.sgml
+DISTCLEANFILES = $(BUILT_SOURCES)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in $(HTML_IMAGE_SOURCE_FILES)
+EXTRA_DIST += version.xml.in $(HTML_IMAGE_SOURCE_FILES) eds-cursor-example.sgml.in
+
+CLEANFILES += $(BUILT_SOURCES)
 
 # Uncomment this to enable tests, currently we are still
 # quite far from passing them
diff --git a/docs/reference/eds/eds-cursor-example.sgml b/docs/reference/eds/eds-cursor-example.sgml.in
similarity index 84%
rename from docs/reference/eds/eds-cursor-example.sgml
rename to docs/reference/eds/eds-cursor-example.sgml.in
index dea758e..a29e7b1 100644
--- a/docs/reference/eds/eds-cursor-example.sgml
+++ b/docs/reference/eds/eds-cursor-example.sgml.in
@@ -70,9 +70,7 @@
       <programlisting>
        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
                     parse="text"
-                    href="../../../../examples/cursor/cursor-example.c">
-          <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
-       </xi:include>
+                    href="@SRCDIR@/examples/cursor/cursor-example.c"/>
       </programlisting>
     </informalexample>
   </refsect1>
@@ -90,9 +88,7 @@
       <programlisting>
        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
                     parse="text"
-                    href="../../../../examples/cursor/cursor-navigator.c">
-          <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
-       </xi:include>
+                    href="@SRCDIR@/examples/cursor/cursor-navigator.c"/>
       </programlisting>
     </informalexample>
   </refsect1>
@@ -110,9 +106,7 @@
       <programlisting>
        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
                     parse="text"
-                    href="../../../../examples/cursor/cursor-search.c">
-          <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
-       </xi:include>
+                    href="@SRCDIR@/examples/cursor/cursor-search.c"/>
       </programlisting>
     </informalexample>
   </refsect1>
@@ -128,9 +122,7 @@
       <programlisting>
        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
                     parse="text"
-                    href="../../../../examples/cursor/cursor-slot.c">
-          <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
-       </xi:include>
+                    href="@SRCDIR@/examples/cursor/cursor-slot.c"/>
       </programlisting>
     </informalexample>
   </refsect1>
@@ -147,9 +139,7 @@
       <programlisting>
        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
                     parse="text"
-                    href="../../../../examples/cursor/cursor-data.c">
-          <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
-       </xi:include>
+                    href="@SRCDIR@/examples/cursor/cursor-data.c"/>
       </programlisting>
     </informalexample>
   </refsect1>
diff --git a/docs/reference/private/Makefile.am b/docs/reference/private/Makefile.am
index bace412..082c947 100644
--- a/docs/reference/private/Makefile.am
+++ b/docs/reference/private/Makefile.am
@@ -36,9 +36,19 @@ GTKDOC_LIBS = \
 # This is needed for cross-references to D-Bus interfaces to work.
 MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=e-dbus
 
+$(DOC_MAIN_SGML_FILE): $(DOC_MAIN_SGML_FILE).in
+       sed -e 's|\ SRCDIR\@|$(abs_top_srcdir)|g' $< > $(@)
+
+BUILT_SOURCES = $(DOC_MAIN_SGML_FILE)
+DISTCLEANFILES = $(BUILT_SOURCES)
+
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 
+EXTRA_DIST += $(DOC_MAIN_SGML_FILE).in
+
+CLEANFILES += $(BUILT_SOURCES)
+
 #TESTS = $(GTKDOC_CHECK)
 
 -include $(top_srcdir)/git.mk
diff --git a/docs/reference/private/libedbus-private-docs.sgml 
b/docs/reference/private/libedbus-private-docs.sgml.in
similarity index 73%
rename from docs/reference/private/libedbus-private-docs.sgml
rename to docs/reference/private/libedbus-private-docs.sgml.in
index 39c7279..331e515 100644
--- a/docs/reference/private/libedbus-private-docs.sgml
+++ b/docs/reference/private/libedbus-private-docs.sgml.in
@@ -30,19 +30,19 @@
 
   <chapter>
     <title>D-Bus Interfaces</title>
-    <xi:include href="../../../private/e-dbus-source-org.gnome.evolution.dataserver.Source.xml"/>
-    <xi:include href="../../../private/e-dbus-source-org.gnome.evolution.dataserver.Source.Removable.xml"/>
-    <xi:include href="../../../private/e-dbus-source-org.gnome.evolution.dataserver.Source.Writable.xml"/>
-    <xi:include 
href="../../../private/e-dbus-source-org.gnome.evolution.dataserver.Source.RemoteCreatable.xml"/>
-    <xi:include 
href="../../../private/e-dbus-source-org.gnome.evolution.dataserver.Source.RemoteDeletable.xml"/>
-    <xi:include 
href="../../../private/e-dbus-source-org.gnome.evolution.dataserver.Source.OAuth2Support.xml"/>
-    <xi:include 
href="../../../private/e-dbus-source-manager-org.gnome.evolution.dataserver.SourceManager.xml"/>
-    <xi:include 
href="../../../private/e-dbus-authenticator-org.gnome.evolution.dataserver.Authenticator.xml"/>
-    <xi:include href="../../../private/e-dbus-address-book-org.gnome.evolution.dataserver.AddressBook.xml"/>
-    <xi:include 
href="../../../private/e-dbus-address-book-factory-org.gnome.evolution.dataserver.AddressBookFactory.xml"/>
-    <xi:include href="../../../private/e-dbus-calendar-org.gnome.evolution.dataserver.Calendar.xml"/>
-    <xi:include 
href="../../../private/e-dbus-calendar-factory-org.gnome.evolution.dataserver.CalendarFactory.xml"/>
-    <xi:include 
href="../../../private/e-dbus-user-prompter-org.gnome.evolution.dataserver.UserPrompter.xml"/>
+    <xi:include href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.xml"/>
+    <xi:include href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.Removable.xml"/>
+    <xi:include href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.Writable.xml"/>
+    <xi:include 
href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.RemoteCreatable.xml"/>
+    <xi:include 
href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.RemoteDeletable.xml"/>
+    <xi:include 
href="@SRCDIR@/private/e-dbus-source-org.gnome.evolution.dataserver.Source.OAuth2Support.xml"/>
+    <xi:include 
href="@SRCDIR@/private/e-dbus-source-manager-org.gnome.evolution.dataserver.SourceManager.xml"/>
+    <xi:include 
href="@SRCDIR@/private/e-dbus-authenticator-org.gnome.evolution.dataserver.Authenticator.xml"/>
+    <xi:include href="@SRCDIR@/private/e-dbus-address-book-org.gnome.evolution.dataserver.AddressBook.xml"/>
+    <xi:include 
href="@SRCDIR@/private/e-dbus-address-book-factory-org.gnome.evolution.dataserver.AddressBookFactory.xml"/>
+    <xi:include href="@SRCDIR@/private/e-dbus-calendar-org.gnome.evolution.dataserver.Calendar.xml"/>
+    <xi:include 
href="@SRCDIR@/private/e-dbus-calendar-factory-org.gnome.evolution.dataserver.CalendarFactory.xml"/>
+    <xi:include 
href="@SRCDIR@/private/e-dbus-user-prompter-org.gnome.evolution.dataserver.UserPrompter.xml"/>
   </chapter>
 
   <index id="api-index-full">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]