From fd904c69f86d57484f25b4fe3c3a3e5d9cf7ce21 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 4 Sep 2014 00:17:30 -0400 Subject: [PATCH] Fix cross references in docs in tarballs This approach is copied from Pango. --- Makefile.am | 1 + configure.ac | 10 ++++++++++ docs/reference/gdk/Makefile.am | 3 ++- docs/reference/gtk/Makefile.am | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index d689b3fbac..3d9d80b74a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -124,6 +124,7 @@ snapshot: DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ + --disable-doc-cross-references \ --enable-man \ --disable-maintainer-mode \ --enable-introspection \ diff --git a/configure.ac b/configure.ac index 58cc3e38e2..733f50bb49 100644 --- a/configure.ac +++ b/configure.ac @@ -1724,6 +1724,16 @@ else AC_MSG_RESULT([no]) fi +AC_ARG_ENABLE(doc-cross-references, + AC_HELP_STRING([--disable-doc-cross-references], + [cross reference symbols from other libraries @<:@default=yes@:>@]), + enable_doc_cross_references=$enableval, + enable_doc_cross_references=yes) + +AM_CONDITIONAL(ENABLE_DOC_CROSS_REFERENCES, test x$enable_doc_cross_references != xno) + + + ################################################## # Visibility handling ################################################## diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index f19ae8cb7d..61f9447db8 100644 --- a/docs/reference/gdk/Makefile.am +++ b/docs/reference/gdk/Makefile.am @@ -135,12 +135,13 @@ HTML_IMAGES = \ images/watch.png \ images/xterm.png +if ENABLE_DOC_CROSS_REFERENCES # Extra options to supply to gtkdoc-fixref FIXXREF_OPTIONS= \ --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \ --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo - +endif include $(top_srcdir)/gtk-doc.make diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index f0eeabb7db..968384c136 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -315,6 +315,7 @@ HTML_IMAGES = \ $(srcdir)/images/flow-box.png \ $(srcdir)/images/inspector.png +if ENABLE_DOC_CROSS_REFERENCES # Extra options to supply to gtkdoc-fixref FIXXREF_OPTIONS=--extra-dir=../gdk/html \ --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \ @@ -323,6 +324,7 @@ FIXXREF_OPTIONS=--extra-dir=../gdk/html \ --extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \ --extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo +endif include $(top_srcdir)/gtk-doc.make