aboutsummaryrefslogtreecommitdiff
path: root/docs/libdbusmenu-glib/reference
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-12-04 09:27:21 -0600
committerCharles Kerr <charles.kerr@canonical.com>2012-12-04 09:27:21 -0600
commit13c7f3ffa0ae517e8a7cfead23aa2fc8e2b39ae6 (patch)
tree82c64060228359695ed38ff755740ca8fb958e2d /docs/libdbusmenu-glib/reference
parentd80123a38cb76f66b5ddef55fc722b60173aceb8 (diff)
downloadlibdbusmenu-13c7f3ffa0ae517e8a7cfead23aa2fc8e2b39ae6.tar.gz
libdbusmenu-13c7f3ffa0ae517e8a7cfead23aa2fc8e2b39ae6.tar.bz2
libdbusmenu-13c7f3ffa0ae517e8a7cfead23aa2fc8e2b39ae6.zip
gtk-doc fix: update to gtk-doc 1.14 w/o templates
Diffstat (limited to 'docs/libdbusmenu-glib/reference')
-rw-r--r--docs/libdbusmenu-glib/reference/Makefile.am21
-rw-r--r--docs/libdbusmenu-glib/reference/tmpl/dummy.sgml0
2 files changed, 9 insertions, 12 deletions
diff --git a/docs/libdbusmenu-glib/reference/Makefile.am b/docs/libdbusmenu-glib/reference/Makefile.am
index 2af5ec3..8e6836a 100644
--- a/docs/libdbusmenu-glib/reference/Makefile.am
+++ b/docs/libdbusmenu-glib/reference/Makefile.am
@@ -78,7 +78,7 @@ INCLUDES=-I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS)
GTKDOC_LIBS=$(top_builddir)/libdbusmenu-glib/libdbusmenu-glib.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.local.make
+include $(top_srcdir)/gtk-doc.make
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
@@ -89,14 +89,11 @@ EXTRA_DIST += version.xml.in
# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
#DISTCLEANFILES +=
-# Comment this out if you want your docs-status tested during 'make check'
-TESTS = gtkdoc-in-srcdir
-
-gtkdoc-in-srcdir: Makefile.am
- @echo "#!/bin/sh" > $@
- @echo "cd \"$(srcdir)\"" >> $@
- @echo "$(GTKDOC_CHECK)" >> $@
- @chmod +x $@
-
-DISTCLEANFILES = gtkdoc-in-srcdir
-
+# Comment this out if you want 'make check' to test you doc status
+# and run some sanity checks
+if ENABLE_GTK_DOC
+ TESTS_ENVIRONMENT = cd $(srcdir) && \
+ DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+ SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
+#TESTS = $(GTKDOC_CHECK)
+endif
diff --git a/docs/libdbusmenu-glib/reference/tmpl/dummy.sgml b/docs/libdbusmenu-glib/reference/tmpl/dummy.sgml
deleted file mode 100644
index e69de29..0000000
--- a/docs/libdbusmenu-glib/reference/tmpl/dummy.sgml
+++ /dev/null