[gnome-bluetooth] lib: Kill libcommon.la



commit 62ddfa4a11d863729d69b6fdbb659791aebe71cf
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Nov 4 19:27:46 2011 +0000

    lib: Kill libcommon.la
    
    It was causing more problems than it was solving, adds a few
    more function entry points, but reduces possible bugs (such as
    the problems with the applet library not working at all before this
    series of commits).

 lib/Makefile.am             |   28 +++++++---------------------
 lib/gnome-bluetooth.symbols |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e4b1c66..2af12f5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,20 +3,8 @@ SUBDIRS = plugins
 EXTRA_DIST = 
 CLEANFILES =
 
-noinst_LTLIBRARIES = libcommon.la
 lib_LTLIBRARIES = libgnome-bluetooth.la
 
-libcommon_la_SOURCES =						\
-		bluetooth-client.h bluetooth-client.c		\
-		bluetooth-utils.h bluetooth-utils.c		\
-		bluetooth-client-private.h			\
-		bluetooth-agent.h bluetooth-agent.c		\
-		bluetooth-enums.h				\
-		rfkill.h
-
-libcommon_la_LIBADD = $(COMMON_LIBS)
-libcommon_la_LDFLAGS = -no-undefined $(AM_LDFLAGS)
-
 # will be scanned for introspection annotation, but won't be installed
 libgnome_bluetooth_c_sources =		\
 	bluetooth-client.c		\
@@ -31,13 +19,13 @@ libgnome_bluetooth_c_sources =		\
 	bluetooth-client-glue.c		\
 	bluetooth-plugin-manager.c
 
-
 libgnome_bluetooth_private_headers =	\
 	bluetooth-client-private.h	\
 	bluetooth-agent.h		\
 	gnome-bluetooth-enum-types.h	\
 	bluetooth-chooser-private.h	\
-	bluetooth-client-glue.h
+	bluetooth-client-glue.h		\
+	rfkill.h
 
 # public headers don't need to be listed, are handled by _HEADERS
 libgnome_bluetooth_la_SOURCES =			\
@@ -111,21 +99,19 @@ BUILT_SOURCES = bluetooth-client-glue.h \
 		gnome-bluetooth-enum-types.h \
 		gnome-bluetooth-enum-types.c
 
-nodist_libcommon_la_SOURCES = $(BUILT_SOURCES)
-
 CLEANFILES += $(BUILT_SOURCES)
 
 noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class
 
-test_client_LDADD = libcommon.la $(GTK_LIBS) $(DBUS_LIBS)
+test_client_LDADD = libgnome-bluetooth.la $(GTK_LIBS)
 
-test_agent_LDADD = libcommon.la $(DBUS_LIBS)
+test_agent_LDADD = libgnome-bluetooth.la
 
-test_deviceselection_LDADD = libcommon.la libgnome-bluetooth.la
+test_deviceselection_LDADD = libgnome-bluetooth.la
 
-test_plugins_LDADD = libcommon.la libgnome-bluetooth.la
+test_plugins_LDADD = libgnome-bluetooth.la
 
-test_class_LDADD = libcommon.la
+test_class_LDADD = libgnome-bluetooth.la
 
 EXTRA_DIST += bluetooth-client.xml gnome-bluetooth.symbols
 
diff --git a/lib/gnome-bluetooth.symbols b/lib/gnome-bluetooth.symbols
index 72bbae6..c78e4a8 100644
--- a/lib/gnome-bluetooth.symbols
+++ b/lib/gnome-bluetooth.symbols
@@ -16,6 +16,8 @@ bluetooth_chooser_stop_discovery
 bluetooth_chooser_button_get_type
 bluetooth_chooser_button_new
 bluetooth_chooser_button_available
+bluetooth_client_create_device
+bluetooth_client_dump_device
 bluetooth_client_get_type
 bluetooth_client_new
 bluetooth_client_get_model
@@ -24,6 +26,7 @@ bluetooth_client_get_adapter_model
 bluetooth_client_get_device_model
 bluetooth_client_connect_service
 bluetooth_client_connect_service_finish
+bluetooth_client_set_trusted
 bluetooth_class_to_type
 bluetooth_type_to_string
 bluetooth_verify_address
@@ -51,3 +54,14 @@ bluetooth_killswitch_has_killswitches
 bluetooth_killswitch_set_state
 bluetooth_killswitch_get_state
 bluetooth_killswitch_state_to_string
+bluetooth_agent_new
+bluetooth_agent_set_pincode_func
+bluetooth_agent_register
+bluetooth_agent_unregister
+bluetooth_agent_set_confirm_func
+bluetooth_agent_set_passkey_func
+bluetooth_agent_set_cancel_func
+bluetooth_agent_error_quark
+bluetooth_agent_set_authorize_func
+bluetooth_agent_set_display_func
+bluetooth_agent_setup



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]