From 1efb10044a2e2aa8b1331e6b3e6ac54325185246 Mon Sep 17 00:00:00 2001
From: David Mohr <david@mcbf.net>
Date: Wed, 21 Apr 2010 18:08:36 -0600
Subject: [PATCH] Fix linking problems with binutils-gold

---
 configure.in.in                    |    1 +
 docs/reference/Makefile.am         |    1 +
 docs/reference/garcon-sections.txt |  321 +++++++++++++++++++-----------------
 garcon/Makefile.am                 |    1 +
 tests/Makefile.am                  |    4 +
 5 files changed, 175 insertions(+), 153 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index fa06465..07f4feb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -111,6 +111,7 @@ dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.14.0])
+XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.14.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.14.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.14.0])
 
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 2cb0e91..f718290 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -65,6 +65,7 @@ INCLUDES =	 							\
 
 GTKDOC_LIBS =								\
 	$(GLIB_CFLAGS)							\
+	$(GOBJECT_CFLAGS)						\
 	$(GTHREAD_LIBS)							\
 	$(GTK_CFLAGS)							\
 	$(LIBXFCE4UTIL_LIBS)						\
diff --git a/docs/reference/garcon-sections.txt b/docs/reference/garcon-sections.txt
index d9b5332..81c054a 100644
--- a/docs/reference/garcon-sections.txt
+++ b/docs/reference/garcon-sections.txt
@@ -1,39 +1,27 @@
 <SECTION>
-<FILE>garcon-menu</FILE>
-GarconMenu
-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
+<FILE>garcon-menu-tree-provider</FILE>
+<TITLE>GarconMenuTreeProvider</TITLE>
+GarconMenuTreeProviderIface
+GarconMenuTreeProvider
+garcon_menu_tree_provider_get_tree
+garcon_menu_tree_provider_get_file
 <SUBSECTION Standard>
-GarconMenuClass
-GarconMenuPrivate
-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_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-menu-merger</FILE>
+<TITLE>GarconMenuMerger</TITLE>
+GarconMenuMergerPrivate
+GarconMenuMergerClass
 GarconMenuMerger
 garcon_menu_merger_new
 garcon_menu_merger_run
 <SUBSECTION Standard>
-GarconMenuMergerClass
-GarconMenuMergerPrivate
 GARCON_MENU_MERGER
 GARCON_IS_MENU_MERGER
 GARCON_TYPE_MENU_MERGER
@@ -44,67 +32,51 @@ GARCON_MENU_MERGER_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garcon-menu-separator</FILE>
-GarconMenuSeparator
-garcon_menu_separator_get_default
+<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>
-GarconMenuSeparatorClass
-GARCON_MENU_SEPARATOR
-GARCON_IS_MENU_SEPARATOR
-GARCON_TYPE_MENU_SEPARATOR
-garcon_menu_separator_get_type
-GARCON_MENU_SEPARATOR_CLASS
-GARCON_IS_MENU_SEPARATOR_CLASS
-GARCON_MENU_SEPARATOR_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-node</FILE>
-GarconMenuNodeType
-GarconMenuLayoutMergeType
-GarconMenuMergeFileType
-GarconMenuNodeClass
-GarconMenuNode
-garcon_menu_node_get_type
-garcon_menu_node_new
-garcon_menu_node_get_node_type
-garcon_menu_node_create
-garcon_menu_node_copy
-garcon_menu_node_get_string
-garcon_menu_node_set_string
-garcon_menu_node_get_merge_file_type
-garcon_menu_node_set_merge_file_type
-garcon_menu_node_get_merge_file_filename
-garcon_menu_node_set_merge_file_filename
-garcon_menu_node_tree_get_child_node
-garcon_menu_node_tree_get_child_nodes
-garcon_menu_node_tree_get_string_children
-garcon_menu_node_tree_get_boolean_child
-garcon_menu_node_tree_get_string_child
-garcon_menu_node_tree_rule_matches
-garcon_menu_node_tree_get_node_type
-garcon_menu_node_tree_get_string
-garcon_menu_node_tree_set_string
-garcon_menu_node_tree_get_layout_merge_type
-garcon_menu_node_tree_get_merge_file_type
-garcon_menu_node_tree_get_merge_file_filename
-garcon_menu_node_tree_set_merge_file_filename
-garcon_menu_node_tree_compare
-garcon_menu_node_tree_copy
-garcon_menu_node_tree_free
-garcon_menu_node_tree_free_data
+<FILE>garcon-menu-item-cache</FILE>
+<TITLE>GarconMenuItemCache</TITLE>
+GarconMenuItemCachePrivate
+GarconMenuItemCacheClass
+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_NODE
-GARCON_IS_MENU_NODE
-GARCON_TYPE_MENU_NODE
-garcon_menu_node_type_get_type
-GARCON_MENU_NODE_CLASS
-GARCON_IS_MENU_NODE_CLASS
-GARCON_MENU_NODE_GET_CLASS
+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-directory</FILE>
+<TITLE>GarconMenuDirectory</TITLE>
+GarconMenuDirectoryPrivate
+GarconMenuDirectoryClass
 GarconMenuDirectory
 garcon_menu_directory_new
 garcon_menu_directory_get_file
@@ -121,8 +93,6 @@ garcon_menu_directory_get_show_in_environment
 garcon_menu_directory_get_visible
 garcon_menu_directory_equal
 <SUBSECTION Standard>
-GarconMenuDirectoryPrivate
-GarconMenuDirectoryClass
 GARCON_MENU_DIRECTORY
 GARCON_IS_MENU_DIRECTORY
 GARCON_TYPE_MENU_DIRECTORY
@@ -133,78 +103,10 @@ GARCON_MENU_DIRECTORY_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>garcon-menu-item-cache</FILE>
-GarconMenuItemCache
-garcon_menu_item_cache_get_default
-garcon_menu_item_cache_lookup
-garcon_menu_item_cache_foreach
-garcon_menu_item_cache_invalidate
-<SUBSECTION Standard>
-GarconMenuItemCachePrivate
-GarconMenuItemCacheClass
-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-parser</FILE>
-garcon_menu_parser_new
-garcon_menu_parser_run
-GarconMenuParser
-<SUBSECTION Standard>
-GarconMenuParserPrivate
-GarconMenuParserClass
-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-tree-provider</FILE>
-GarconMenuTreeProvider
-GarconMenuTreeProviderIface
-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-menu-item-pool</FILE>
-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>
-GarconMenuItemPoolPrivate
-GarconMenuItemPoolClass
-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</FILE>
+<TITLE>GarconMenuItem</TITLE>
+GarconMenuItemPrivate
+GarconMenuItemClass
 GarconMenuItem
 garcon_menu_item_new
 garcon_menu_item_new_for_path
@@ -248,8 +150,6 @@ garcon_menu_item_get_allocated
 garcon_menu_item_increment_allocated
 garcon_menu_item_decrement_allocated
 <SUBSECTION Standard>
-GarconMenuItemPrivate
-GarconMenuItemClass
 GARCON_MENU_ITEM
 GARCON_IS_MENU_ITEM
 GARCON_TYPE_MENU_ITEM
@@ -260,7 +160,88 @@ GARCON_MENU_ITEM_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>garcon-menu-parser</FILE>
+<TITLE>GarconMenuParser</TITLE>
+GarconMenuParserPrivate
+GarconMenuParserClass
+GarconMenuParser
+garcon_menu_parser_new
+garcon_menu_parser_run
+<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
+GarconMenuMergeFileType
+GarconMenuNodeData
+GarconMenuNodeClass
+GarconMenuNode
+garcon_menu_node_get_type
+garcon_menu_node_new
+garcon_menu_node_get_node_type
+garcon_menu_node_create
+garcon_menu_node_copy
+garcon_menu_node_get_string
+garcon_menu_node_set_string
+garcon_menu_node_get_merge_file_type
+garcon_menu_node_set_merge_file_type
+garcon_menu_node_get_merge_file_filename
+garcon_menu_node_set_merge_file_filename
+garcon_menu_node_tree_get_child_node
+garcon_menu_node_tree_get_child_nodes
+garcon_menu_node_tree_get_string_children
+garcon_menu_node_tree_get_boolean_child
+garcon_menu_node_tree_get_string_child
+garcon_menu_node_tree_rule_matches
+garcon_menu_node_tree_get_node_type
+garcon_menu_node_tree_get_string
+garcon_menu_node_tree_set_string
+garcon_menu_node_tree_get_layout_merge_type
+garcon_menu_node_tree_get_merge_file_type
+garcon_menu_node_tree_get_merge_file_filename
+garcon_menu_node_tree_set_merge_file_filename
+garcon_menu_node_tree_compare
+garcon_menu_node_tree_copy
+garcon_menu_node_tree_free
+garcon_menu_node_tree_free_data
+<SUBSECTION Standard>
+GARCON_MENU_NODE
+GARCON_IS_MENU_NODE
+GARCON_TYPE_MENU_NODE
+garcon_menu_node_type_get_type
+GARCON_MENU_NODE_CLASS
+GARCON_IS_MENU_NODE_CLASS
+GARCON_MENU_NODE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>garcon-menu-separator</FILE>
+<TITLE>GarconMenuSeparator</TITLE>
+GarconMenuSeparatorClass
+GarconMenuSeparator
+garcon_menu_separator_get_default
+<SUBSECTION Standard>
+GARCON_MENU_SEPARATOR
+GARCON_IS_MENU_SEPARATOR
+GARCON_TYPE_MENU_SEPARATOR
+garcon_menu_separator_get_type
+GARCON_MENU_SEPARATOR_CLASS
+GARCON_IS_MENU_SEPARATOR_CLASS
+GARCON_MENU_SEPARATOR_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>garcon-menu-element</FILE>
+<TITLE>GarconMenuElement</TITLE>
 GarconMenuElement
 GarconMenuElementIface
 garcon_menu_element_get_name
@@ -278,6 +259,35 @@ GARCON_MENU_ELEMENT_GET_IFACE
 </SECTION>
 
 <SECTION>
+<FILE>garcon-menu</FILE>
+<TITLE>GarconMenu</TITLE>
+GarconMenuPrivate
+GarconMenuClass
+GarconMenu
+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
+<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
+</SECTION>
+
+<SECTION>
 <FILE>garcon-environment</FILE>
 garcon_set_environment
 garcon_get_environment
@@ -296,3 +306,8 @@ garcon_check_version
 garcon_config_lookup
 </SECTION>
 
+<SECTION>
+<FILE>garcon</FILE>
+GARCON_INSIDE_GARCON_H
+</SECTION>
+
diff --git a/garcon/Makefile.am b/garcon/Makefile.am
index 84bc7e8..8a1f56a 100644
--- a/garcon/Makefile.am
+++ b/garcon/Makefile.am
@@ -84,6 +84,7 @@ libgarcon_1_la_LDFLAGS =						\
 	
 libgarcon_1_la_LIBADD = 						\
 	$(GLIB_LIBS)							\
+	$(GOBJECT_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GIO_LIBS)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ec22c5a..0885cb1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -38,6 +38,8 @@ test_menu_parser_DEPENDENCIES =						\
 test_menu_parser_LDADD =						\
 	$(LIBXFCE4UTIL_LIBS)						\
 	$(GLIB_LIBS)							\
+	$(GIO_LIBS)							\
+	$(GOBJECT_LIBS)							\
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
 
 test_menu_spec_SOURCES =						\
@@ -53,6 +55,8 @@ test_menu_spec_DEPENDENCIES =						\
 test_menu_spec_LDADD =							\
 	$(LIBXFCE4UTIL_LIBS)						\
 	$(GLIB_LIBS)							\
+	$(GIO_LIBS)							\
+	$(GOBJECT_LIBS)							\
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
 
 EXTRA_DIST =								\
-- 
1.7.0.4