diff options
| author | Michael Biebl <biebl@debian.org> | 2009-11-09 16:20:18 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2009-11-09 16:33:54 +0100 |
| commit | 12ef5a6b8a75ffdfd718704752a3594326216ee7 (patch) | |
| tree | 30aeb7d50b6fcbdbbd21af4e304cf8f55693a9f5 | |
| parent | 897cd3048429d9a0c8b20ec6c9b94b3c869605bf (diff) | |
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
| -rw-r--r-- | hald/linux/probing/Makefile.am | 12 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/hald/linux/probing/Makefile.am b/hald/linux/probing/Makefile.am index 74409249..ec7f94da 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 0b99d356..e7f029d0 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 |