diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-01-30 11:06:26 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-01-30 11:06:26 +0000 |
| commit | bd333ad26f451f27f0d412f8a42f42459377bd7c (patch) | |
| tree | 88817c7c7f21fc3c63395767e9c42acd588eefef /docs | |
| parent | ee33a9adfc9c657c3be11a8bcaf25e687fdde026 (diff) | |
| parent | 3e9b3f1cd28e9c9e1263796297f5d648a163be9e (diff) | |
| download | libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.tar.gz libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.tar.bz2 libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.zip | |
This is a continuation of ~mathieu-tl/libappindicator/fix-test-merge/ which adds fixes for bug #1102589, bug #1102595, bug #1109128, and bug #1103087, which should get it finally passing CI. Fixes: https://bugs.launchpad.net/bugs/1102589, https://bugs.launchpad.net/bugs/1102595, https://bugs.launchpad.net/bugs/1103087, https://bugs.launchpad.net/bugs/1109128.
Approved by Ted Gould, PS Jenkins bot.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/Makefile.am | 22 | ||||
| -rw-r--r-- | docs/reference/tmpl/libappindicator-unused.sgml | 42 |
2 files changed, 10 insertions, 54 deletions
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 8f87b34..2c201bd 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -30,7 +30,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=../../src +DOC_SOURCE_DIR=$(top_srcdir)/src # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()" @@ -102,7 +102,7 @@ GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_ GTKDOC_LIBS=$(top_builddir)/src/$(APPINDICATORLIB) $(LIBRARY_LIBS) # 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 @@ -113,13 +113,11 @@ EXTRA_DIST += version.xml.in libappindicator-docs.sgml.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/reference/tmpl/libappindicator-unused.sgml b/docs/reference/tmpl/libappindicator-unused.sgml deleted file mode 100644 index 789a03f..0000000 --- a/docs/reference/tmpl/libappindicator-unused.sgml +++ /dev/null @@ -1,42 +0,0 @@ -<!-- ##### MACRO APP_INDICATOR_SIGNAL_NEW_ACCESSIBLE_DESC ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL AppIndicator::new-accessible-desc ##### --> -<para> - -</para> - -@appindicator: the object which received the signal. -@arg1: - -<!-- ##### ARG AppIndicator:accessible-desc ##### --> -<para> - -</para> - - -<!-- ##### ARG AppIndicator:icon-path ##### --> -<para> - -</para> - - -<!-- ##### FUNCTION app_indicator_get_accessible_desc ##### --> -<para> - -</para> - -@self: -@Returns: - -<!-- ##### FUNCTION app_indicator_set_accessible_desc ##### --> -<para> - -</para> - -@self: -@accessible_desc: - |