gnome-bluetooth r433 - in trunk: . common

[hadess svn gnome org]

Author: hadess
Date: Tue Mar  3 15:46:51 2009
New Revision: 433
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=433&view=rev

Log:
Fix linking for libcommon

As we link against libhal now.



Modified:
   trunk/common/Makefile.am
   trunk/configure.ac

Modified: trunk/common/Makefile.am
==============================================================================
--- trunk/common/Makefile.am	(original)
+++ trunk/common/Makefile.am	Tue Mar  3 15:46:51 2009
@@ -9,7 +9,8 @@
 		obex-agent.h obex-agent.c \
 		helper.c helper.h \
 		bluetooth-enums.h
-libcommon_la_LIBADD = $(LIBGNOMEBT_LIBS)
+libcommon_la_LIBADD = $(COMMON_LIBS)
+libcommon_la_LDFLAGS = -no-undefined $(AM_LDFLAGS)
 
 libgnome_bluetooth_la_SOURCES =				\
 	bluetooth-enums.h				\
@@ -34,7 +35,7 @@
 	bluetooth-chooser-button.h			\
 	bluetooth-enums.h
 
-AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
+AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = marshal.h marshal.c \
 		bluetooth-client-glue.h \

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar  3 15:46:51 2009
@@ -70,7 +70,6 @@
 dnl Requires for the properties window
 PKG_CHECK_MODULES(PROPS,
 		  dbus-glib-1 >= $DBUS_GLIB_REQUIRED
-		  hal >= $HAL_REQUIRED
 		  gconf-2.0
 		  gtk+-2.0
 		  unique-1.0)
@@ -95,11 +94,17 @@
 		  gtk+-2.0
 		  unique-1.0)
 
-dnl Requires for the libraries
+dnl Requires for the public library
 PKG_CHECK_MODULES(LIBGNOMEBT,
 		  dbus-glib-1 >= $DBUS_GLIB_REQUIRED
 		  gtk+-2.0)
 
+dnl Requires for the private library
+PKG_CHECK_MODULES(COMMON,
+		  dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+		  gtk+-2.0
+		  hal >= $HAL_REQUIRED)
+
 DBUS_BINDING_TOOL="dbus-binding-tool"
 AC_SUBST(DBUS_BINDING_TOOL)