diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-21 11:22:46 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-21 11:22:46 -0600 |
| commit | 2f92a8662f5a84f9ef35dd847539f573f60edc5f (patch) | |
| tree | 9c00fda471a88fcc331c858bc2de66076f7de9ef /docs | |
| parent | 71020d95b0eb9f583523628261d26336a5dceb39 (diff) | |
| parent | 34248e4fe3aeef17be5fe9f2339057fbaee81ad2 (diff) | |
| download | libdbusmenu-2f92a8662f5a84f9ef35dd847539f573f60edc5f.tar.gz libdbusmenu-2f92a8662f5a84f9ef35dd847539f573f60edc5f.tar.bz2 libdbusmenu-2f92a8662f5a84f9ef35dd847539f573f60edc5f.zip | |
Another update to trunk
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libdbusmenu-glib/reference/tmpl/dummy.sgml | 0 | ||||
| -rw-r--r-- | docs/libdbusmenu-gtk/reference/Makefile.am | 13 | ||||
| -rw-r--r-- | docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml | 2 | ||||
| -rw-r--r-- | docs/libdbusmenu-gtk/reference/tmpl/dummy.sgml | 0 |
4 files changed, 11 insertions, 4 deletions
diff --git a/docs/libdbusmenu-glib/reference/tmpl/dummy.sgml b/docs/libdbusmenu-glib/reference/tmpl/dummy.sgml new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/docs/libdbusmenu-glib/reference/tmpl/dummy.sgml diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am index 21d95bd..be9f69c 100644 --- a/docs/libdbusmenu-gtk/reference/Makefile.am +++ b/docs/libdbusmenu-gtk/reference/Makefile.am @@ -1,5 +1,12 @@ + ## Process this file with automake to produce Makefile.in +if USE_GTK3 +VER=3 +else +VER= +endif + # We require automake 1.6 at least. AUTOMAKE_OPTIONS = 1.6 @@ -9,7 +16,7 @@ AUTOMAKE_OPTIONS = 1.6 # of using the various options. # The name of the module, e.g. 'glib'. -DOC_MODULE=libdbusmenu-gtk +DOC_MODULE=libdbusmenu-gtk$(VER) # The top-level SGML file. You can change this if you want to. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml @@ -47,7 +54,7 @@ CFILE_GLOB=$(top_srcdir)/libdbusmenu-gtk/*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES= +IGNORE_HFILES=genericmenuitem.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png @@ -68,7 +75,7 @@ expand_content_files= # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) INCLUDES=-I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk.la +GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk$(VER).la $(DBUSMENUGLIB_LIBS) $(DBUSMENUGTK_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.local.make diff --git a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml index ae9ab07..ec6b82f 100644 --- a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml +++ b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml @@ -13,8 +13,8 @@ <title>API</title> <xi:include href="xml/menu.xml"/> <xi:include href="xml/client.xml"/> - <xi:include href="xml/genericmenuitem.xml"/> <xi:include href="xml/menuitem.xml"/> + <xi:include href="xml/serializablemenuitem.xml"/> </chapter> <chapter id="object-tree"> diff --git a/docs/libdbusmenu-gtk/reference/tmpl/dummy.sgml b/docs/libdbusmenu-gtk/reference/tmpl/dummy.sgml new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/docs/libdbusmenu-gtk/reference/tmpl/dummy.sgml |