GNOME.org
 

gnome-bluetooth r325 - in trunk: . applet browse common properties sendto wizard

Author: hadess
Date: Wed Feb 25 14:38:56 2009
New Revision: 325
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=325&view=rev

Log:
Revive the device selection widget

Use libtool to create the libgnome-bluetooth-1.0 library, update
the code to compile again (somewhat works, minus the run-time
warnings), and install a .pc file.

Modified:
   trunk/.gitignore
   trunk/Makefile.am
   trunk/applet/Makefile.am
   trunk/browse/Makefile.am
   trunk/common/Makefile.am
   trunk/common/bluetooth-device-selection.c
   trunk/common/bluetooth-device-selection.h
   trunk/common/test-deviceselection.c
   trunk/configure.ac
   trunk/properties/Makefile.am
   trunk/sendto/Makefile.am
   trunk/wizard/Makefile.am

Modified: trunk/.gitignore
==============================================================================
--- trunk/.gitignore	(original)
+++ trunk/.gitignore	Wed Feb 25 14:38:56 2009
@@ -8,7 +8,9 @@
 config.h
 config.h.in
 config.log
+config.guess
 config.status
+config.sub
 configure
 depcomp
 install-sh
@@ -18,6 +20,8 @@
 intltool-merge.in
 intltool-update
 intltool-update.in
+ltmain.sh
+libtool
 missing
 mkinstalldirs
 stamp-h1
@@ -31,6 +35,7 @@
 
 common/test-client
 common/test-agent
+common/test-deviceselection
 applet/bluetooth-applet
 applet/test-agentdialog
 properties/bluetooth-properties
@@ -45,4 +50,6 @@
 *~
 *.rej
 *.orig
+*.lo
+*.la
 bluetooth-manager.xml

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Feb 25 14:38:56 2009
@@ -11,7 +11,8 @@
 MAINTAINERCLEANFILES = Makefile.in \
 	aclocal.m4 configure config.h.in config.sub config.guess \
 	ltmain.sh depcomp missing install-sh mkinstalldirs \
-	intltool-extract.in intltool-update.in intltool-merge.in
+	intltool-extract.in intltool-update.in intltool-merge.in \
+	gnome-bluetooth-1.0.pc
 
 install-data-hook:
 if ICON_UPDATE

Modified: trunk/applet/Makefile.am
==============================================================================
--- trunk/applet/Makefile.am	(original)
+++ trunk/applet/Makefile.am	Wed Feb 25 14:38:56 2009
@@ -3,14 +3,14 @@
 
 bluetooth_applet_SOURCES = main.c notify.h notify.c agent.h agent.c
 
-bluetooth_applet_LDADD = $(top_builddir)/common/libcommon.a \
+bluetooth_applet_LDADD = $(top_builddir)/common/libcommon.la \
 			@NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @DBUS_LIBS@
 
 noinst_PROGRAMS = test-agentdialog
 
 test_agentdialog_SOURCES = test-agentdialog.c notify.h notify.c
 
-test_agentdialog_LDADD = $(top_builddir)/common/libcommon.a \
+test_agentdialog_LDADD = $(top_builddir)/common/libcommon.la \
 				@NOTIFY_LIBS@ @GTK_LIBS@ @DBUS_LIBS@
 
 AM_CFLAGS = @DBUS_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ $(WARN_CFLAGS) $(DISABLE_DEPRECATED)

Modified: trunk/browse/Makefile.am
==============================================================================
--- trunk/browse/Makefile.am	(original)
+++ trunk/browse/Makefile.am	Wed Feb 25 14:38:56 2009
@@ -3,7 +3,7 @@
 
 bluetooth_browse_SOURCES = main.c
 
-bluetooth_browse_LDADD = $(top_builddir)/common/libcommon.a \
+bluetooth_browse_LDADD = $(top_builddir)/common/libcommon.la \
 						@GTK_LIBS@ @DBUS_LIBS@
 
 AM_CFLAGS = @DBUS_CFLAGS@ @GTK_CFLAGS@ $(WARN_CFLAGS) $(DISABLE_DEPRECATED)

Modified: trunk/common/Makefile.am
==============================================================================
--- trunk/common/Makefile.am	(original)
+++ trunk/common/Makefile.am	Wed Feb 25 14:38:56 2009
@@ -1,13 +1,21 @@
 
-noinst_LIBRARIES = libcommon.a
+noinst_LTLIBRARIES = libcommon.la
+lib_LTLIBRARIES = libgnome-bluetooth-1.0.la
 
-libcommon_a_SOURCES = helper.h helper.c \
+libcommon_la_SOURCES = helper.h helper.c \
 		bluetooth-instance.h bluetooth-instance.c \
 		bluetooth-client.h bluetooth-client.c \
 		bluetooth-agent.h bluetooth-agent.c \
-		obex-agent.h obex-agent.c
+		obex-agent.h obex-agent.c \
+		helper.c helper.h
 
-AM_CFLAGS = @DBUS_CFLAGS@ @GTK_CFLAGS@ $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
+libgnome_bluetooth_1_0_la_SOURCES =			\
+	bluetooth-client.h bluetooth-client.c		\
+	marshal.h marshal.c				\
+	bluetooth-device-selection.c bluetooth-device-selection.h
+libgnome_bluetooth_1_0_la_LIBADD = $(GTK_LIBS) $(DBUS_LIBS)
+
+AM_CFLAGS = -I$(srcdir) @DBUS_CFLAGS@ @GTK_CFLAGS@ $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = marshal.h marshal.c \
 		bluetooth-instance-glue.h \
@@ -15,15 +23,17 @@
 		bluetooth-agent-glue.h \
 		obex-agent-glue.h
 
-nodist_libcommon_a_SOURCES = $(BUILT_SOURCES)
+nodist_libcommon_la_SOURCES = $(BUILT_SOURCES)
 
 CLEANFILES = $(BUILT_SOURCES)
 
-noinst_PROGRAMS = test-client test-agent
+noinst_PROGRAMS = test-client test-agent test-deviceselection
+
+test_client_LDADD = libcommon.la $(GTK_LIBS) $(DBUS_LIBS)
 
-test_client_LDADD = libcommon.a @GTK_LIBS@ @DBUS_LIBS@
+test_agent_LDADD = libcommon.la $(DBUS_LIBS)
 
-test_agent_LDADD = libcommon.a @DBUS_LIBS@
+test_deviceselection_LDADD = libgnome-bluetooth-1.0.la
 
 EXTRA_DIST = marshal.list \
 		bluetooth-instance.xml \

Modified: trunk/common/bluetooth-device-selection.c
==============================================================================
--- trunk/common/bluetooth-device-selection.c	(original)
+++ trunk/common/bluetooth-device-selection.c	Wed Feb 25 14:38:56 2009
@@ -30,8 +30,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "client.h"
-
+#include "bluetooth-client.h"
 #include "bluetooth-device-selection.h"
 
 enum {
@@ -68,7 +67,7 @@
 	int device_type_filter;
 	int device_category_filter;
 
-	guint show_bonded : 1;
+	guint show_paired : 1;
 	guint show_search : 1;
 	guint show_device_type : 1;
 	guint show_device_category : 1;
@@ -82,7 +81,7 @@
 	switch (type) {
 	case BLUETOOTH_CATEGORY_ALL:
 		return N_("All categories");
-	case BLUETOOTH_CATEGORY_BONDED:
+	case BLUETOOTH_CATEGORY_PAIRED:
 		return N_("Bonded");
 	case BLUETOOTH_CATEGORY_TRUSTED:
 		return N_("Trusted");
@@ -107,8 +106,8 @@
 	gchar *address;
 	gchar *name;
 
-	gtk_tree_model_get (model, iter, COLUMN_ADDRESS, &address,
-			    COLUMN_NAME, &name, -1);
+	gtk_tree_model_get (model, iter, BLUETOOTH_COLUMN_ADDRESS, &address,
+			    BLUETOOTH_COLUMN_NAME, &name, -1);
 
 	/* If we don't have a name, replace the name with the
 	 * Bluetooth address, with the ":" replaced by "-" */
@@ -129,7 +128,7 @@
 {
 	guint type;
 
-	gtk_tree_model_get (model, iter, COLUMN_TYPE, &type, -1);
+	gtk_tree_model_get (model, iter, BLUETOOTH_COLUMN_TYPE, &type, -1);
 
 	switch (type) {
 	case BLUETOOTH_TYPE_PHONE:
@@ -174,7 +173,7 @@
 {
 	gboolean bonded;
 
-	gtk_tree_model_get (model, iter, COLUMN_BONDED, &bonded, -1);
+	gtk_tree_model_get (model, iter, BLUETOOTH_COLUMN_PAIRED, &bonded, -1);
 
 	if (bonded == FALSE)
 		g_object_set (cell, "stock-id", NULL, NULL);
@@ -188,7 +187,7 @@
 {
 	guint type;
 
-	gtk_tree_model_get (model, iter, COLUMN_TYPE, &type, -1);
+	gtk_tree_model_get (model, iter, BLUETOOTH_COLUMN_TYPE, &type, -1);
 	if (type == 0)
 		g_object_set (cell, "text", _("Unknown"), NULL);
 	else
@@ -201,7 +200,7 @@
 	BluetoothDeviceSelectionPrivate *priv = BLUETOOTH_DEVICE_SELECTION_GET_PRIVATE(self);
 
 	gtk_widget_set_sensitive (GTK_WIDGET(priv->search_button), FALSE);
-	bluetooth_client_discover_devices (priv->client, NULL);
+	bluetooth_client_start_discovery (priv->client);
 }
 
 gchar *
@@ -216,7 +215,7 @@
 	if (selected == FALSE)
 		return NULL;
 
-	gtk_tree_model_get (priv->filter, &iter, COLUMN_ADDRESS, &address, -1);
+	gtk_tree_model_get (priv->filter, &iter, BLUETOOTH_COLUMN_ADDRESS, &address, -1);
 	return address;
 }
 
@@ -232,7 +231,7 @@
 	if (selected == FALSE)
 		return NULL;
 
-	gtk_tree_model_get (priv->filter, &iter, COLUMN_NAME, &name, -1);
+	gtk_tree_model_get (priv->filter, &iter, BLUETOOTH_COLUMN_NAME, &name, -1);
 	return name;
 }
 
@@ -286,7 +285,7 @@
 	if (priv->device_type_filter == BLUETOOTH_TYPE_ANY)
 		return TRUE;
 
-	gtk_tree_model_get (model, iter, COLUMN_TYPE, &type, -1);
+	gtk_tree_model_get (model, iter, BLUETOOTH_COLUMN_TYPE, &type, -1);
 	return (type & priv->device_type_filter);
 }
 
@@ -296,16 +295,16 @@
 	if (priv->device_category_filter == BLUETOOTH_CATEGORY_ALL)
 		return TRUE;
 
-	if (priv->device_category_filter == BLUETOOTH_CATEGORY_BONDED) {
+	if (priv->device_category_filter == BLUETOOTH_CATEGORY_PAIRED) {
 		gboolean bonded;
 
-		gtk_tree_model_get (model, iter, COLUMN_BONDED, &bonded, -1);
+		gtk_tree_model_get (model, iter, BLUETOOTH_COLUMN_PAIRED, &bonded, -1);
 		return bonded;
 	}
 	if (priv->device_category_filter == BLUETOOTH_CATEGORY_TRUSTED) {
 		gboolean trusted;
 
-		gtk_tree_model_get (model, iter, COLUMN_TRUSTED, &trusted, -1);
+		gtk_tree_model_get (model, iter, BLUETOOTH_COLUMN_TRUSTED, &trusted, -1);
 		return trusted;
 	}
 
@@ -367,7 +366,7 @@
 	if (adapter == NULL)
 		return;
 
-	priv->model = bluetooth_client_get_model_with_filter (priv->client, NULL, NULL, NULL);
+	priv->model = bluetooth_client_get_device_filter_model (priv->client, NULL, NULL, NULL, NULL);
 	if (priv->model) {
 		priv->filter = gtk_tree_model_filter_new (priv->model, NULL);
 		gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (priv->filter),
@@ -446,7 +445,7 @@
 			  G_CALLBACK(select_browse_device_callback), self);
 
 	/* Set the model, and filter */
-	priv->model = bluetooth_client_get_model_with_filter (priv->client, NULL, NULL, NULL);
+	priv->model = bluetooth_client_get_device_filter_model (priv->client, NULL, NULL, NULL, NULL);
 	if (priv->model) {
 		priv->filter = gtk_tree_model_filter_new (priv->model, NULL);
 		gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (priv->filter),
@@ -467,7 +466,6 @@
 bluetooth_device_selection_init(BluetoothDeviceSelection *self)
 {
 	BluetoothDeviceSelectionPrivate *priv = BLUETOOTH_DEVICE_SELECTION_GET_PRIVATE(self);
-	GtkTooltips *tooltips;
 	char *str;
 	int i;
 
@@ -478,7 +476,7 @@
 	GtkWidget *scrolled_window;
 	GtkWidget *table;
 
-	priv->show_bonded = FALSE;
+	priv->show_paired = FALSE;
 	priv->show_search = FALSE;
 
 	priv->client = bluetooth_client_new ();
@@ -488,8 +486,6 @@
 	priv->discov_completed_id = g_signal_connect (G_OBJECT(priv->client),
 			"discovery-completed", G_CALLBACK(discovery_completed), self);
 
-	tooltips = gtk_tooltips_new ();
-
 	/* Setup the widget itself */
 	gtk_box_set_spacing (GTK_BOX(self), 18);
 	gtk_container_set_border_width (GTK_CONTAINER(self), 0);
@@ -532,7 +528,7 @@
 	gtk_box_pack_end (GTK_BOX (hbox), priv->search_button, FALSE, TRUE, 0);
 	g_signal_connect (G_OBJECT(priv->search_button), "clicked",
 			  G_CALLBACK(search_button_clicked), self);
-	gtk_tooltips_set_tip (tooltips, priv->search_button, _("Rescan Bluetooth devices"), NULL);
+	gtk_widget_set_tooltip_text (priv->search_button, _("Rescan Bluetooth devices"));
 	if (priv->show_search)
 		gtk_widget_show (priv->search_button);
 
@@ -584,7 +580,7 @@
 	gtk_table_attach (GTK_TABLE (table), priv->device_category, 1, 2, 1, 2,
 			  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 			  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-	gtk_tooltips_set_tip (tooltips, priv->device_category, _("Select the device category to filter above list"), NULL);
+	gtk_widget_set_tooltip_text (priv->device_category, _("Select the device category to filter above list"));
 	for (i = 0; i < BLUETOOTH_CATEGORY_NUM_CATEGORIES; i++) {
 		gtk_combo_box_append_text (GTK_COMBO_BOX(priv->device_category),
 					   _(bluetooth_device_category_to_string (i)));
@@ -613,9 +609,9 @@
 	gtk_table_attach (GTK_TABLE (table), priv->device_type, 1, 2, 0, 1,
 			  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 			  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-	gtk_tooltips_set_tip (tooltips, priv->device_type, _("Select the device type to filter above list"), NULL);
+	gtk_widget_set_tooltip_text (priv->device_type, _("Select the device type to filter above list"));
 	/* The types match the types used in client.h */
-	for (i = 0; i < BLUETOOTH_TYPE_NUM_TYPES; i++) {
+	for (i = 0; i < _BLUETOOTH_TYPE_NUM_TYPES; i++) {
 		gtk_combo_box_append_text (GTK_COMBO_BOX(priv->device_type),
 					   _(bluetooth_type_to_string (1 << i)));
 	}
@@ -644,7 +640,7 @@
 	g_signal_handler_disconnect (G_OBJECT(priv->client), priv->discov_completed_id);
 	g_signal_handler_disconnect (G_OBJECT(priv->client), priv->default_adapter_changed_id);
 
-	bluetooth_client_cancel_discovery (priv->client, NULL);
+	bluetooth_client_stop_discovery (priv->client);
 }
 
 enum {
@@ -652,7 +648,7 @@
 	PROP_TITLE,
 	PROP_DEVICE_SELECTED,
 	PROP_DEVICE_SELECTED_NAME,
-	PROP_SHOW_BONDING,
+	PROP_SHOW_PAIRING,
 	PROP_SHOW_SEARCH,
 	PROP_SHOW_DEVICE_TYPE,
 	PROP_SHOW_DEVICE_CATEGORY,
@@ -679,10 +675,10 @@
 			g_free (str);
 		}
 		break;
-	case PROP_SHOW_BONDING:
-		priv->show_bonded = g_value_get_boolean (value);
+	case PROP_SHOW_PAIRING:
+		priv->show_paired = g_value_get_boolean (value);
 		if (priv->bonded_cell != NULL)
-			g_object_set (G_OBJECT (priv->bonded_cell), "visible", priv->show_bonded, NULL);
+			g_object_set (G_OBJECT (priv->bonded_cell), "visible", priv->show_paired, NULL);
 		break;
 	case PROP_SHOW_SEARCH:
 		priv->show_search = g_value_get_boolean (value);
@@ -734,8 +730,8 @@
 	case PROP_DEVICE_SELECTED_NAME:
 		g_value_take_string (value, bluetooth_device_selection_get_selected_device_name (self));
 		break;
-	case PROP_SHOW_BONDING:
-		g_value_set_boolean (value, priv->show_bonded);
+	case PROP_SHOW_PAIRING:
+		g_value_set_boolean (value, priv->show_paired);
 		break;
 	case PROP_SHOW_SEARCH:
 		g_value_set_boolean (value, priv->show_search);
@@ -787,7 +783,7 @@
 					 PROP_DEVICE_SELECTED_NAME, g_param_spec_string ("device-selected-name",
 										    NULL, NULL, NULL, G_PARAM_READABLE));
 	g_object_class_install_property (G_OBJECT_CLASS(klass),
-					 PROP_SHOW_BONDING, g_param_spec_boolean ("show-bonding",
+					 PROP_SHOW_PAIRING, g_param_spec_boolean ("show-pairing",
 										  NULL, NULL, FALSE, G_PARAM_READWRITE));
 	g_object_class_install_property (G_OBJECT_CLASS(klass),
 					 PROP_SHOW_SEARCH, g_param_spec_boolean ("show-search",
@@ -800,7 +796,7 @@
 											  NULL, NULL, TRUE, G_PARAM_READWRITE));
 	g_object_class_install_property (G_OBJECT_CLASS(klass),
 					 PROP_DEVICE_TYPE_FILTER, g_param_spec_int ("device-type-filter", NULL, NULL,
-										    1, 1 << (BLUETOOTH_TYPE_NUM_TYPES - 1), 1, G_PARAM_READWRITE));
+										    1, 1 << (_BLUETOOTH_TYPE_NUM_TYPES - 1), 1, G_PARAM_READWRITE));
 	g_object_class_install_property (G_OBJECT_CLASS(klass),
 					 PROP_DEVICE_CATEGORY_FILTER, g_param_spec_int ("device-category-filter", NULL, NULL,
 					 						0, BLUETOOTH_CATEGORY_NUM_CATEGORIES, 0, G_PARAM_READWRITE));

Modified: trunk/common/bluetooth-device-selection.h
==============================================================================
--- trunk/common/bluetooth-device-selection.h	(original)
+++ trunk/common/bluetooth-device-selection.h	Wed Feb 25 14:38:56 2009
@@ -43,7 +43,7 @@
 
 enum {
 	BLUETOOTH_CATEGORY_ALL,
-	BLUETOOTH_CATEGORY_BONDED,
+	BLUETOOTH_CATEGORY_PAIRED,
 	BLUETOOTH_CATEGORY_TRUSTED,
 	BLUETOOTH_CATEGORY_NUM_CATEGORIES
 };
@@ -64,7 +64,10 @@
 GType bluetooth_device_selection_get_type (void);
 
 GtkWidget *bluetooth_device_selection_new (const gchar *title);
+
 gchar *bluetooth_device_selection_get_selected_device (BluetoothDeviceSelection *sel);
+gchar *bluetooth_device_selection_get_selected_device_name (BluetoothDeviceSelection *self);
+
 void bluetooth_device_selection_start_discovery (BluetoothDeviceSelection *sel);
 
 G_END_DECLS

Modified: trunk/common/test-deviceselection.c
==============================================================================
--- trunk/common/test-deviceselection.c	(original)
+++ trunk/common/test-deviceselection.c	Wed Feb 25 14:38:56 2009
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 
 #include "bluetooth-device-selection.h"
-#include "client.h"
+#include "bluetooth-client.h"
 
 static void device_selected_cb(GObject *object,
 			       GParamSpec *spec, gpointer user_data)

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Feb 25 14:38:56 2009
@@ -4,13 +4,25 @@
 AM_INIT_AUTOMAKE(gnome-bluetooth, 2.27.0)
 AM_CONFIG_HEADER(config.h)
 
+# Before making a release, the GNOMEBT_LT_VERSION string should be modified.
+# The string is of the form C:R:A.
+# - If interfaces have been changed or added, but binary compatibility has
+#   been preserved, change to C+1:0:A+1
+# - If binary compatibility has been broken (eg removed or changed interfaces)
+#   change to C+1:0:0
+# - If the interface is the same as the previous version, change to C:R+1:A
+GNOMEBT_LT_VERSION=2:0:0
+AC_SUBST(GNOMEBT_LT_VERSION)
+
 AM_MAINTAINER_MODE
 
 AC_LANG_C
-
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_RANLIB
+
+dnl Initialize libtool
+AM_DISABLE_STATIC
+AM_PROG_LIBTOOL
 
 GETTEXT_PACKAGE=gnome-bluetooth
 AC_SUBST(GETTEXT_PACKAGE)
@@ -90,6 +102,7 @@
 GNOME_MAINTAINER_MODE_DEFINES
 
 AC_OUTPUT(Makefile
+	  gnome-bluetooth-1.0.pc
 	  icons/Makefile
 	  common/Makefile
 	  applet/Makefile
@@ -99,3 +112,4 @@
 	  browse/Makefile
 	  po/Makefile.in
 )
+

Modified: trunk/properties/Makefile.am
==============================================================================
--- trunk/properties/Makefile.am	(original)
+++ trunk/properties/Makefile.am	Wed Feb 25 14:38:56 2009
@@ -4,7 +4,7 @@
 bluetooth_properties_SOURCES = main.c general.h general.c \
 				killswitch.h killswitch.c adapter.h adapter.c
 
-bluetooth_properties_LDADD = $(top_builddir)/common/libcommon.a \
+bluetooth_properties_LDADD = $(top_builddir)/common/libcommon.la \
 				@GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@
 
 AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ $(WARN_CFLAGS) $(DISABLE_DEPRECATED)

Modified: trunk/sendto/Makefile.am
==============================================================================
--- trunk/sendto/Makefile.am	(original)
+++ trunk/sendto/Makefile.am	Wed Feb 25 14:38:56 2009
@@ -3,7 +3,7 @@
 
 bluetooth_sendto_SOURCES = main.c
 
-bluetooth_sendto_LDADD = $(top_builddir)/common/libcommon.a \
+bluetooth_sendto_LDADD = $(top_builddir)/common/libcommon.la \
 					@GTK_LIBS@ @GIO_LIBS@ @DBUS_LIBS@
 
 AM_CFLAGS = @DBUS_CFLAGS@ @GIO_CFLAGS@ @GTK_CFLAGS@ $(WARN_CFLAGS) $(DISABLE_DEPRECATED)

Modified: trunk/wizard/Makefile.am
==============================================================================
--- trunk/wizard/Makefile.am	(original)
+++ trunk/wizard/Makefile.am	Wed Feb 25 14:38:56 2009
@@ -3,7 +3,7 @@
 
 bluetooth_wizard_SOURCES = main.c
 
-bluetooth_wizard_LDADD = $(top_builddir)/common/libcommon.a \
+bluetooth_wizard_LDADD = $(top_builddir)/common/libcommon.la \
 						@GTK_LIBS@ @DBUS_LIBS@
 
 AM_CFLAGS = @DBUS_CFLAGS@ @GTK_CFLAGS@ $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]