eog r4957 - in trunk: . doc/reference

[friemann svn gnome org]

Author: friemann
Date: Mon Jan 19 11:31:40 2009
New Revision: 4957
URL: http://svn.gnome.org/viewvc/eog?rev=4957&view=rev

Log:
2009-01-19  Felix Riemann  <friemann svn gnome org>

	* configure.ac:
	* doc/reference/Makefile.am:
	* doc/reference/eog-docs.sgml:
	* doc/reference/eog-docs.sgml.in:
	* doc/reference/eog.types:
	Fix gtk-doc compilation when not compiling with any of libexif or
	exempi. Fixes bug#557662 (Arun Raghavan).


Added:
   trunk/doc/reference/eog-docs.sgml.in
Removed:
   trunk/doc/reference/eog-docs.sgml
   trunk/doc/reference/eog.types
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/doc/reference/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jan 19 11:31:40 2009
@@ -171,6 +171,17 @@
 
 AM_CONDITIONAL([HAVE_EXEMPI], [test "x$have_exempi" = "xyes"])
  
+# Build EXIF-related documentation if we really have support for it
+if test "x$have_exif" = "xyes" || test "x$have_exempi" = "xyes"; then
+  EOG_DOC_EXIF_START=""
+  EOG_DOC_EXIF_STOP=""
+else
+  EOG_DOC_EXIF_START="<!--"
+  EOG_DOC_EXIF_STOP="-->"
+fi
+
+AC_SUBST([EOG_DOC_EXIF_START])
+AC_SUBST([EOG_DOC_EXIF_STOP])
 
 # ********************
 # Jpeg (semi-optional)
@@ -412,6 +423,7 @@
 doc/Makefile
 doc/reference/Makefile
 doc/reference/version.xml
+doc/reference/eog-docs.sgml
 plugins/Makefile
 plugins/reload/Makefile
 plugins/fullscreen/Makefile

Modified: trunk/doc/reference/Makefile.am
==============================================================================
--- trunk/doc/reference/Makefile.am	(original)
+++ trunk/doc/reference/Makefile.am	Mon Jan 19 11:31:40 2009
@@ -25,7 +25,7 @@
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=
+SCAN_OPTIONS=--rebuild-types
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
@@ -57,6 +57,14 @@
 	eog-module.h \
 	eog-python-module.h
 
+if !HAVE_EXIF
+if !HAVE_EXEMPI
+IGNORE_HFILES +=			\
+	eog-exif-util.h			\
+	eog-exif-details.h
+endif
+endif
+
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES=
@@ -110,12 +118,13 @@
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in \
+	      $(DOC_MODULE)-docs.sgml
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-#DISTCLEANFILES +=
+DISTCLEANFILES = $(DOC_MODULE).types
 
 # Comment this out if you want your docs-status tested during 'make check'
 #TESTS = $(GTKDOC_CHECK)

Added: trunk/doc/reference/eog-docs.sgml.in
==============================================================================
--- (empty file)
+++ trunk/doc/reference/eog-docs.sgml.in	Mon Jan 19 11:31:40 2009
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
+<!ENTITY version SYSTEM "version.xml">
+]>
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude";>
+  <bookinfo>
+    <title>Eye of GNOME Reference Manual</title>
+    <releaseinfo>
+      for Eye of GNOME &version;
+    </releaseinfo>
+  </bookinfo>
+
+  <chapter>
+    <title>User Interface</title>
+    <xi:include href="xml/eog-properties-dialog.xml"/>
+    <xi:include href="xml/eog-list-store.xml"/>
+    <xi:include href="xml/eog-file-chooser.xml"/>
+    <xi:include href="xml/eog-thumb-nav.xml"/>
+    <xi:include href="xml/eog-thumb-view.xml"/>
+    <xi:include href="xml/eog-scroll-view.xml"/>
+    <xi:include href="xml/eog-window.xml"/>
+    <xi:include href="xml/eog-statusbar.xml"/>
+    @EOG_DOC_EXIF_START@
+    <xi:include href="xml/eog-exif-details.xml"/>
+    @EOG_DOC_EXIF_STOP@
+    <xi:include href="xml/eog-message-area.xml"/>
+    <xi:include href="xml/eog-dialog.xml"/>
+    <xi:include href="xml/eog-sidebar.xml"/>
+    <xi:include href="xml/eog-thumbnail.xml"/>
+    <xi:include href="xml/eog-save-as-dialog-helper.xml"/>
+    <xi:include href="xml/eog-pixbuf-cell-renderer.xml"/>
+    <xi:include href="xml/eog-error-message-area.xml"/>
+  </chapter>
+
+  <chapter>
+    <title>Image data and manipulation</title>
+    <xi:include href="xml/eog-image.xml"/>
+    <xi:include href="xml/eog-image-save-info.xml"/>
+    <xi:include href="xml/eog-transform.xml"/>
+    <xi:include href="xml/eog-metadata-reader.xml"/>
+    <xi:include href="xml/eog-metadata-reader-png.xml"/>
+    <xi:include href="xml/eog-metadata-reader-jpg.xml"/>
+  </chapter>
+
+  <chapter>
+    <title>Printing</title>
+    <xi:include href="xml/eog-print-preview.xml"/>
+    <xi:include href="xml/eog-print-image-setup.xml"/>
+    <xi:include href="xml/eog-print.xml"/>
+  </chapter>
+
+  <chapter>
+    <title>Application and configuration</title>
+    <xi:include href="xml/eog-preferences-dialog.xml"/>
+    <xi:include href="xml/eog-application.xml"/>
+    <xi:include href="xml/eog-session.xml"/>
+    <xi:include href="xml/eog-config-keys.xml"/>
+  </chapter>
+
+  <chapter>
+    <title>Plugins</title>
+    <xi:include href="xml/eog-plugin.xml"/>
+    <xi:include href="xml/eog-plugin-manager.xml"/>
+    <xi:include href="xml/eog-plugin-engine.xml"/>
+  </chapter>
+
+  <chapter>
+    <title>Utilities</title>
+    <xi:include href="xml/eog-debug.xml"/>
+    <xi:include href="xml/eog-uri-converter.xml"/>
+    <xi:include href="xml/eog-util.xml"/>
+    @EOG_DOC_EXIF_START@
+    <xi:include href="xml/eog-exif-util.xml"/>
+    @EOG_DOC_EXIF_STOP@
+    <xi:include href="xml/eog-pixbuf-util.xml"/>
+    <xi:include href="xml/zoom.xml"/>
+    <xi:include href="xml/uta.xml"/>
+  </chapter>
+
+  <chapter>
+    <title>Asynchronous jobs</title>
+    <xi:include href="xml/eog-jobs.xml"/>
+    <xi:include href="xml/eog-job-queue.xml"/>
+  </chapter>
+</book>