hal: Branch 'master'

[Martin Pitt]

 hald/linux/probing/Makefile.am |   12 ++++++------
 tools/Makefile.am              |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 12ef5a6b8a75ffdfd718704752a3594326216ee7
Author: Michael Biebl <biebl at debian.org>
Date:   Mon Nov 9 16:20:18 2009 +0100

    Fix build failures with binutils-gold
    
    binutils gold is an alternative linker which is more strict and requires
    to specify all needed libraries when linking.
    
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554767

diff --git a/hald/linux/probing/Makefile.am b/hald/linux/probing/Makefile.am
index 7440924..ec7f94d 100644
--- a/hald/linux/probing/Makefile.am
+++ b/hald/linux/probing/Makefile.am
@@ -24,17 +24,17 @@ libexec_PROGRAMS = 			\
 endif
 
 hald_probe_smbios_SOURCES = probe-smbios.c ../../logger.c
-hald_probe_smbios_LDADD = $(top_builddir)/libhal/libhal.la
+hald_probe_smbios_LDADD = $(top_builddir)/libhal/libhal.la @DBUS_LIBS@
 
 hald_probe_printer_SOURCES = probe-printer.c ../../logger.c
 hald_probe_printer_LDADD = $(top_builddir)/libhal/libhal.la @GLIB_LIBS@
 #TODO : get rid of glib in hald_probe_printer
 
 hald_probe_input_SOURCES = probe-input.c ../../logger.c
-hald_probe_input_LDADD = $(top_builddir)/libhal/libhal.la
+hald_probe_input_LDADD = $(top_builddir)/libhal/libhal.la @DBUS_LIBS@
 
 hald_probe_hiddev_SOURCES = probe-hiddev.c ../../logger.c
-hald_probe_hiddev_LDADD = $(top_builddir)/libhal/libhal.la
+hald_probe_hiddev_LDADD = $(top_builddir)/libhal/libhal.la @DBUS_LIBS@
 
 hald_probe_serial_SOURCES = probe-serial.c ../../logger.c
 hald_probe_serial_LDADD = $(top_builddir)/libhal/libhal.la
@@ -48,11 +48,11 @@ hald_probe_volume_SOURCES = probe-volume.c linux_dvd_rw_utils.c ../../logger.c
 hald_probe_volume_LDADD = $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la @GLIB_LIBS@ @BLKID_LIBS@
 
 hald_probe_ieee1394_unit_SOURCES = probe-ieee1394-unit.c ../../logger.c
-hald_probe_ieee1394_unit_LDADD = $(top_builddir)/libhal/libhal.la
+hald_probe_ieee1394_unit_LDADD = $(top_builddir)/libhal/libhal.la @DBUS_LIBS@
 
 hald_probe_net_bluetooth_SOURCES = probe-net-bluetooth.c ../../logger.c
-hald_probe_net_bluetooth_LDADD = $(top_builddir)/libhal/libhal.la
+hald_probe_net_bluetooth_LDADD = $(top_builddir)/libhal/libhal.la @DBUS_LIBS@
 
 hald_probe_video4linux_SOURCES = probe-video4linux.c ../../logger.c
-hald_probe_video4linux_LDADD = $(top_builddir)/libhal/libhal.la
+hald_probe_video4linux_LDADD = $(top_builddir)/libhal/libhal.la @DBUS_LIBS@
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0b99d35..e7f029d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -91,7 +91,7 @@ endif #HAVE_GPERF
 
 hal_setup_keymap_SOURCES = hal-setup-keymap.c
 nodist_hal_setup_keymap_SOURCES = hal-setup-keymap-hash-name.h
-hal_setup_keymap_LDADD = $(top_builddir)/libhal/libhal.la
+hal_setup_keymap_LDADD = $(top_builddir)/libhal/libhal.la @DBUS_LIBS@
 
 endif #BUILD_KEYMAPS