[Xfce4-commits] <garcon:master> Fix make distcheck and gtk-doc.

Jannis Pohlmann noreply at xfce.org
Sat Oct 10 02:54:01 CEST 2009 

Updating branch refs/heads/master
         to cb4614ae90503aa740fe89fcbf0c7f1d35edb836 (commit)
       from a241b0ab3f9c1d8660c56ffe0d82d13840c75aeb (commit)

commit cb4614ae90503aa740fe89fcbf0c7f1d35edb836
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sat Oct 10 02:53:15 2009 +0200

    Fix make distcheck and gtk-doc.

 docs/reference/Makefile.am         |    3 +
 docs/reference/garcon-sections.txt |  250 ++++++++++++++++++------------------
 garcon/Makefile.am                 |    3 +
 3 files changed, 131 insertions(+), 125 deletions(-)

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 16b7dfb..2cb0e91 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -75,3 +75,6 @@ include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 EXTRA_DIST +=								\
 	version.xml.in
+
+# Required for make distcheck
+dist-hook: all
diff --git a/docs/reference/garcon-sections.txt b/docs/reference/garcon-sections.txt
index 86e07ef..f0c68f5 100644
--- a/docs/reference/garcon-sections.txt
+++ b/docs/reference/garcon-sections.txt
@@ -1,72 +1,43 @@
 <SECTION>
-<FILE>garcon-menu-element</FILE>
-GarconMenuElement
-GarconMenuElementIface
-garcon_menu_element_get_name
-garcon_menu_element_get_comment
-garcon_menu_element_get_icon_name
-garcon_menu_element_get_visible
-garcon_menu_element_get_show_in_environment
-garcon_menu_element_get_no_display
-<SUBSECTION Standard>
-GARCON_MENU_ELEMENT
-GARCON_IS_MENU_ELEMENT
-GARCON_TYPE_MENU_ELEMENT
-garcon_menu_element_get_type
-GARCON_MENU_ELEMENT_GET_IFACE
-</SECTION>
-
-<SECTION>
-<FILE>garcon-menu-parser</FILE>
-GarconMenuParserPrivate
-garcon_menu_parser_new
-garcon_menu_parser_run
-<TITLE>GarconMenuParser</TITLE>
-GarconMenuParser
-<SUBSECTION Standard>
-GARCON_MENU_PARSER
-GARCON_IS_MENU_PARSER
-GARCON_TYPE_MENU_PARSER
-garcon_menu_parser_get_type
-GARCON_MENU_PARSER_CLASS
-GARCON_IS_MENU_PARSER_CLASS
-GARCON_MENU_PARSER_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>garcon-menu-item-cache</FILE>
-GarconMenuItemCachePrivate
-<TITLE>GarconMenuItemCache</TITLE>
-GarconMenuItemCache
-garcon_menu_item_cache_get_default
-garcon_menu_item_cache_lookup
-garcon_menu_item_cache_foreach
-garcon_menu_item_cache_invalidate
+<FILE>garcon-menu</FILE>
+GarconMenuPrivate
+garcon_menu_new
+garcon_menu_new_for_path
+garcon_menu_new_applications
+garcon_menu_load
+garcon_menu_get_file
+garcon_menu_get_directory
+garcon_menu_get_menus
+garcon_menu_add_menu
+garcon_menu_get_menu_with_name
+garcon_menu_get_parent
+garcon_menu_get_item_pool
+garcon_menu_get_items
+garcon_menu_get_elements
+<TITLE>GarconMenu</TITLE>
+GarconMenu
 <SUBSECTION Standard>
-GARCON_MENU_ITEM_CACHE
-GARCON_IS_MENU_ITEM_CACHE
-GARCON_TYPE_MENU_ITEM_CACHE
-garcon_menu_item_cache_get_type
-GARCON_MENU_ITEM_CACHE_CLASS
-GARCON_IS_MENU_ITEM_CACHE_CLASS
-GARCON_MENU_ITEM_CACHE_GET_CLASS
+GARCON_MENU
+GARCON_IS_MENU
+GARCON_TYPE_MENU
+garcon_menu_get_type
+GARCON_MENU_CLASS
+GARCON_IS_MENU_CLASS
+GARCON_MENU_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garcon-menu-merger</FILE>
-GarconMenuMergerPrivate
-garcon_menu_merger_new
-garcon_menu_merger_run
-<TITLE>GarconMenuMerger</TITLE>
-GarconMenuMerger
+<FILE>garcon-menu-tree-provider</FILE>
+GarconMenuTreeProviderIface
+GarconMenuTreeProvider
+garcon_menu_tree_provider_get_tree
+garcon_menu_tree_provider_get_file
 <SUBSECTION Standard>
-GARCON_MENU_MERGER
-GARCON_IS_MENU_MERGER
-GARCON_TYPE_MENU_MERGER
-garcon_menu_merger_get_type
-GARCON_MENU_MERGER_CLASS
-GARCON_IS_MENU_MERGER_CLASS
-GARCON_MENU_MERGER_GET_CLASS
+GARCON_MENU_TREE_PROVIDER
+GARCON_IS_MENU_TREE_PROVIDER
+GARCON_TYPE_MENU_TREE_PROVIDER
+garcon_menu_tree_provider_get_type
+GARCON_MENU_TREE_PROVIDER_GET_IFACE
 </SECTION>
 
 <SECTION>
@@ -85,6 +56,23 @@ GARCON_MENU_SEPARATOR_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>garcon-menu-parser</FILE>
+GarconMenuParserPrivate
+garcon_menu_parser_new
+garcon_menu_parser_run
+<TITLE>GarconMenuParser</TITLE>
+GarconMenuParser
+<SUBSECTION Standard>
+GARCON_MENU_PARSER
+GARCON_IS_MENU_PARSER
+GARCON_TYPE_MENU_PARSER
+garcon_menu_parser_get_type
+GARCON_MENU_PARSER_CLASS
+GARCON_IS_MENU_PARSER_CLASS
+GARCON_MENU_PARSER_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>garcon-menu-node</FILE>
 GarconMenuNodeType
 GarconMenuLayoutMergeType
@@ -130,6 +118,23 @@ GARCON_MENU_NODE_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>garcon-menu-merger</FILE>
+GarconMenuMergerPrivate
+garcon_menu_merger_new
+garcon_menu_merger_run
+<TITLE>GarconMenuMerger</TITLE>
+GarconMenuMerger
+<SUBSECTION Standard>
+GARCON_MENU_MERGER
+GARCON_IS_MENU_MERGER
+GARCON_TYPE_MENU_MERGER
+garcon_menu_merger_get_type
+GARCON_MENU_MERGER_CLASS
+GARCON_IS_MENU_MERGER_CLASS
+GARCON_MENU_MERGER_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>garcon-menu-item</FILE>
 GarconMenuItemPrivate
 <TITLE>GarconMenuItem</TITLE>
@@ -186,31 +191,61 @@ GARCON_MENU_ITEM_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garcon-menu</FILE>
-GarconMenuPrivate
-garcon_menu_new
-garcon_menu_new_for_path
-garcon_menu_new_applications
-garcon_menu_load
-garcon_menu_get_file
-garcon_menu_get_directory
-garcon_menu_get_menus
-garcon_menu_add_menu
-garcon_menu_get_menu_with_name
-garcon_menu_get_parent
-garcon_menu_get_item_pool
-garcon_menu_get_items
-garcon_menu_get_elements
-<TITLE>GarconMenu</TITLE>
-GarconMenu
+<FILE>garcon-menu-item-pool</FILE>
+GarconMenuItemPoolPrivate
+GarconMenuItemPoolClass
+GarconMenuItemPool
+garcon_menu_item_pool_new
+garcon_menu_item_pool_insert
+garcon_menu_item_pool_lookup
+garcon_menu_item_pool_foreach
+garcon_menu_item_pool_apply_exclude_rule
+garcon_menu_item_pool_get_empty
 <SUBSECTION Standard>
-GARCON_MENU
-GARCON_IS_MENU
-GARCON_TYPE_MENU
-garcon_menu_get_type
-GARCON_MENU_CLASS
-GARCON_IS_MENU_CLASS
-GARCON_MENU_GET_CLASS
+GARCON_MENU_ITEM_POOL
+GARCON_IS_MENU_ITEM_POOL
+GARCON_TYPE_MENU_ITEM_POOL
+garcon_menu_item_pool_get_type
+GARCON_MENU_ITEM_POOL_CLASS
+GARCON_IS_MENU_ITEM_POOL_CLASS
+GARCON_MENU_ITEM_POOL_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>garcon-menu-item-cache</FILE>
+GarconMenuItemCachePrivate
+<TITLE>GarconMenuItemCache</TITLE>
+GarconMenuItemCache
+garcon_menu_item_cache_get_default
+garcon_menu_item_cache_lookup
+garcon_menu_item_cache_foreach
+garcon_menu_item_cache_invalidate
+<SUBSECTION Standard>
+GARCON_MENU_ITEM_CACHE
+GARCON_IS_MENU_ITEM_CACHE
+GARCON_TYPE_MENU_ITEM_CACHE
+garcon_menu_item_cache_get_type
+GARCON_MENU_ITEM_CACHE_CLASS
+GARCON_IS_MENU_ITEM_CACHE_CLASS
+GARCON_MENU_ITEM_CACHE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>garcon-menu-element</FILE>
+GarconMenuElement
+GarconMenuElementIface
+garcon_menu_element_get_name
+garcon_menu_element_get_comment
+garcon_menu_element_get_icon_name
+garcon_menu_element_get_visible
+garcon_menu_element_get_show_in_environment
+garcon_menu_element_get_no_display
+<SUBSECTION Standard>
+GARCON_MENU_ELEMENT
+GARCON_IS_MENU_ELEMENT
+GARCON_TYPE_MENU_ELEMENT
+garcon_menu_element_get_type
+GARCON_MENU_ELEMENT_GET_IFACE
 </SECTION>
 
 <SECTION>
@@ -243,41 +278,6 @@ GARCON_MENU_DIRECTORY_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garcon-menu-item-pool</FILE>
-GarconMenuItemPoolPrivate
-GarconMenuItemPoolClass
-GarconMenuItemPool
-garcon_menu_item_pool_new
-garcon_menu_item_pool_insert
-garcon_menu_item_pool_lookup
-garcon_menu_item_pool_foreach
-garcon_menu_item_pool_apply_exclude_rule
-garcon_menu_item_pool_get_empty
-<SUBSECTION Standard>
-GARCON_MENU_ITEM_POOL
-GARCON_IS_MENU_ITEM_POOL
-GARCON_TYPE_MENU_ITEM_POOL
-garcon_menu_item_pool_get_type
-GARCON_MENU_ITEM_POOL_CLASS
-GARCON_IS_MENU_ITEM_POOL_CLASS
-GARCON_MENU_ITEM_POOL_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>garcon-menu-tree-provider</FILE>
-GarconMenuTreeProviderIface
-GarconMenuTreeProvider
-garcon_menu_tree_provider_get_tree
-garcon_menu_tree_provider_get_file
-<SUBSECTION Standard>
-GARCON_MENU_TREE_PROVIDER
-GARCON_IS_MENU_TREE_PROVIDER
-GARCON_TYPE_MENU_TREE_PROVIDER
-garcon_menu_tree_provider_get_type
-GARCON_MENU_TREE_PROVIDER_GET_IFACE
-</SECTION>
-
-<SECTION>
 <FILE>garcon-config</FILE>
 GARCON_MAJOR_VERSION
 GARCON_MINOR_VERSION
@@ -291,12 +291,12 @@ garcon_config_lookup
 </SECTION>
 
 <SECTION>
-<FILE>garcon-private</FILE>
+<FILE>garcon</FILE>
+GARCON_INSIDE_GARCON_H
 </SECTION>
 
 <SECTION>
-<FILE>garcon</FILE>
-GARCON_INSIDE_GARCON_H
+<FILE>garcon-private</FILE>
 </SECTION>
 
 <SECTION>
diff --git a/garcon/Makefile.am b/garcon/Makefile.am
index 3228e1f..84bc7e8 100644
--- a/garcon/Makefile.am
+++ b/garcon/Makefile.am
@@ -92,3 +92,6 @@ EXTRA_DIST =								\
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = garcon-1.pc
+
+# Required for gtk-doc and make distcheck
+dist-hook: all

More information about the Xfce4-commits mailing list