diff options
| author | Luke Yelavich <luke.yelavich@canonical.com> | 2011-02-14 13:24:18 +1100 |
|---|---|---|
| committer | Luke Yelavich <luke.yelavich@canonical.com> | 2011-02-14 13:24:18 +1100 |
| commit | 5824bcdd09bc63f62ecc9856d8e10115df73a863 (patch) | |
| tree | 50838df753123fd5f87402693d9d5db50de2cf61 /docs | |
| parent | b63c137778bbec1fb010f095e08750817744fced (diff) | |
| parent | 1c384cdf7e601e3786fc1add31d157c0eafa1539 (diff) | |
| download | libayatana-appindicator-5824bcdd09bc63f62ecc9856d8e10115df73a863.tar.gz libayatana-appindicator-5824bcdd09bc63f62ecc9856d8e10115df73a863.tar.bz2 libayatana-appindicator-5824bcdd09bc63f62ecc9856d8e10115df73a863.zip | |
Merge from trunk
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/Makefile.am | 15 | ||||
| -rw-r--r-- | docs/reference/libappindicator-docs.sgml.in | 4 | ||||
| -rw-r--r-- | docs/reference/libappindicator-sections.txt | 1 |
3 files changed, 14 insertions, 6 deletions
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index ae23e0b..8f87b34 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -3,18 +3,21 @@ # We require automake 1.6 at least. AUTOMAKE_OPTIONS = 1.6 +if USE_GTK3 +VER=3 +APPINDICATORLIB = libappindicator3.la +else +VER= +APPINDICATORLIB = libappindicator.la +endif + # This is a blank Makefile.am for using gtk-doc. # Copy this to your project's API docs directory and modify the variables to # suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples # of using the various options. # The name of the module, e.g. 'glib'. -if USE_GTK3 -DOC_MODULE=libappindicator3 -else DOC_MODULE=libappindicator -endif - # Uncomment for versioned docs and specify the version of the module, e.g. '2'. #DOC_MODULE_VERSION=2 @@ -96,7 +99,7 @@ expand_content_files= # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/$(DOC_MODULE).la $(LIBRARY_LIBS) +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 diff --git a/docs/reference/libappindicator-docs.sgml.in b/docs/reference/libappindicator-docs.sgml.in index 3a8e5de..67c7cc6 100644 --- a/docs/reference/libappindicator-docs.sgml.in +++ b/docs/reference/libappindicator-docs.sgml.in @@ -25,6 +25,10 @@ <title>API Index</title> <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> </index> + <index id="api-index-deprecated"> + <title>Deprecated API Index</title> + <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include> + </index> <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> </book> diff --git a/docs/reference/libappindicator-sections.txt b/docs/reference/libappindicator-sections.txt index 602e8d9..d09c498 100644 --- a/docs/reference/libappindicator-sections.txt +++ b/docs/reference/libappindicator-sections.txt @@ -13,6 +13,7 @@ APP_INDICATOR_SIGNAL_NEW_LABEL APP_INDICATOR_SIGNAL_NEW_ACCESSIBLE_DESC APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH APP_INDICATOR_SIGNAL_CONNECTION_CHANGED +APP_INDICATOR_SIGNAL_SCROLL_EVENT AppIndicatorCategory AppIndicatorStatus AppIndicatorPrivate |