From 47d48f8c3eb464e27f9632f51ce574fc9358143b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Jun 2010 15:17:26 -0500 Subject: Trying a dummy sgml file --- docs/libdbusmenu-glib/reference/Makefile.am | 2 +- docs/libdbusmenu-glib/reference/tmpl/dummy.sgml | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 docs/libdbusmenu-glib/reference/tmpl/dummy.sgml (limited to 'docs') diff --git a/docs/libdbusmenu-glib/reference/Makefile.am b/docs/libdbusmenu-glib/reference/Makefile.am index e8a3610..8119537 100644 --- a/docs/libdbusmenu-glib/reference/Makefile.am +++ b/docs/libdbusmenu-glib/reference/Makefile.am @@ -80,7 +80,7 @@ include $(top_srcdir)/gtk-doc.local.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += version.xml.in +EXTRA_DIST += version.xml.in tmpl/dummy.sgml # Files not to distribute # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types 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 -- cgit v1.2.3 From d6970de44f5ce5e6572761bc68d4252061794c9d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Jun 2010 15:20:24 -0500 Subject: Apparently you can't use EXTRA_DIST like this with gtk-doc. Why be normal? --- docs/libdbusmenu-glib/reference/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/libdbusmenu-glib/reference/Makefile.am b/docs/libdbusmenu-glib/reference/Makefile.am index 8119537..e8a3610 100644 --- a/docs/libdbusmenu-glib/reference/Makefile.am +++ b/docs/libdbusmenu-glib/reference/Makefile.am @@ -80,7 +80,7 @@ include $(top_srcdir)/gtk-doc.local.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += version.xml.in tmpl/dummy.sgml +EXTRA_DIST += version.xml.in # Files not to distribute # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types -- cgit v1.2.3 From 327143819733e9104a6f9b6ee043289d09a5fae5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Jun 2010 20:19:34 -0500 Subject: Adding a dummy sgml file. --- docs/libdbusmenu-gtk/reference/tmpl/dummy.sgml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/libdbusmenu-gtk/reference/tmpl/dummy.sgml (limited to 'docs') 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 -- cgit v1.2.3 From 12cc39d7e2b62a279377448338a0e8af384494f2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 23 Nov 2010 16:19:52 -0500 Subject: Make gtk-doc building gtk3 friendly --- docs/libdbusmenu-gtk/reference/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am index ec1bd28..6e44a23 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 @@ -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 -- cgit v1.2.3 From b8d297276d4e8598c5509413b40001a0cd514786 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 21 Jan 2011 17:01:41 -0600 Subject: Removing generic menu item (it's not public) and adding serializable menu item --- docs/libdbusmenu-gtk/reference/Makefile.am | 2 +- docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am index 6e44a23..191d68e 100644 --- a/docs/libdbusmenu-gtk/reference/Makefile.am +++ b/docs/libdbusmenu-gtk/reference/Makefile.am @@ -54,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 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 @@ API - + -- cgit v1.2.3