summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2006-06-29 18:54:02 +0200
committerBehdad Esfahbod <behdad@behdad.org>2006-06-30 02:21:50 +0200
commitde939f52061ba9a1c739c193e3e4f549668855cc (patch)
tree971e991e9cc5fd78899e875cff82d7f80fbc5f7a
parent647ca37ca3d4b1954f7400deeeaaf245b5c90e69 (diff)
Require gtk-doc 1.6, and make it ignore cairo_public and cairo_private
decorators.
-rw-r--r--configure.in2
-rw-r--r--doc/public/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 15c2e428..835ee794 100644
--- a/configure.in
+++ b/configure.in
@@ -530,7 +530,7 @@ AC_SUBST(CAIRO_LIBS)
dnl ===========================================================================
dnl Check for gtk-doc and docbook
-GTK_DOC_CHECK([1.3])
+GTK_DOC_CHECK([1.6])
dnl ===========================================================================
dnl Check for recent pkg-config which supports Requires.private
diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index 0899e8d6..21996d26 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -9,7 +9,7 @@ DOC_MODULE=cairo
DOC_MAIN_SGML_FILE=cairo-docs.xml
# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED"
+SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED" --ignore-decorators="cairo_public|cairo_private"
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../src