diff options
| author | Ted Gould <ted@gould.cx> | 2012-12-18 20:06:31 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2012-12-18 20:06:31 +0000 |
| commit | 95730ece25fd41c39e0127cdb5c1b3e8a6052ed1 (patch) | |
| tree | 8459395c4c3d76c389787da9ed4efb49dd985f90 /docs/libdbusmenu-glib | |
| parent | aded707997d09c33b7e3566edb236a1ac849e051 (diff) | |
| parent | 8c16682b1277d1ddbcd78cead66475a08933ca20 (diff) | |
| download | libdbusmenu-95730ece25fd41c39e0127cdb5c1b3e8a6052ed1.tar.gz libdbusmenu-95730ece25fd41c39e0127cdb5c1b3e8a6052ed1.tar.bz2 libdbusmenu-95730ece25fd41c39e0127cdb5c1b3e8a6052ed1.zip | |
Properly inline + fixes for gtkdoc tests (much of the gtkdoc work done by Charles).
Approved by Charles Kerr.
Diffstat (limited to 'docs/libdbusmenu-glib')
| -rw-r--r-- | docs/libdbusmenu-glib/reference/Makefile.am | 23 | ||||
| -rw-r--r-- | docs/libdbusmenu-glib/reference/tmpl/dummy.sgml | 0 |
2 files changed, 10 insertions, 13 deletions
diff --git a/docs/libdbusmenu-glib/reference/Makefile.am b/docs/libdbusmenu-glib/reference/Makefile.am index 2af5ec3..6de90cb 100644 --- a/docs/libdbusmenu-glib/reference/Makefile.am +++ b/docs/libdbusmenu-glib/reference/Makefile.am @@ -18,7 +18,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting the functions and macros. # e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=../../../libdbusmenu-glib +DOC_SOURCE_DIR=$(abs_top_srcdir)/libdbusmenu-glib $(abs_top_builddir)/libdbusmenu-glib # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()" @@ -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 |