diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | docs/Makefile.am | 3 | ||||
| -rw-r--r-- | docs/pango-docs.sgml | 5 |
4 files changed, 21 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2007-02-20 Stefan Kost <ensonic@users.sf.net> + + Xrefs for glib and cairo in the docs. Add object hierarchy to the docs. + + * configure.in: + * docs/Makefile.am: + * docs/pango-docs.sgml: + 2007-02-18 Behdad Esfahbod <behdad@gnome.org> Bug 409212 – Missing link flag prevents build with "-z defs" ld flags diff --git a/configure.in b/configure.in index 8214306d..58fc97df 100644 --- a/configure.in +++ b/configure.in @@ -627,6 +627,12 @@ fi AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno) +GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" +CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" + +AC_SUBST(GLIB_PREFIX) +AC_SUBST(CAIRO_PREFIX) + dnl ******************************************************** dnl * Options to pass to libtool dnl ******************************************************** diff --git a/docs/Makefile.am b/docs/Makefile.am index a3d665a0..0446d96f 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -80,7 +80,8 @@ HTML_IMAGES = \ rotated-text.png # Extra options to supply to gtkdoc-fixref -FIXXREF_OPTIONS= +FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ + --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo include $(top_srcdir)/gtk-doc.make diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml index 1c916154..c38cf8f7 100644 --- a/docs/pango-docs.sgml +++ b/docs/pango-docs.sgml @@ -30,6 +30,7 @@ <!ENTITY pango-Version SYSTEM "xml/pango-version.xml"> <!ENTITY pango-Vertical-Text SYSTEM "xml/vertical.xml"> <!ENTITY version SYSTEM "version.xml"> +<!ENTITY pango-tree-index SYSTEM "xml/tree_index.sgml"> ]> <book id="index"> <bookinfo> @@ -82,6 +83,10 @@ &pango-querymodules; </chapter> + <chapter id="pango-hierarchy"> + <title>Object Hierarchy</title> + &pango-tree-index; + </chapter> <index/> <index role="deprecated"> |