A couple of dependancy ordering fixes.

Make sure libdbus-util.so is installed/relinked prior to libalsa-util.so
Make sure libbluetooth-util.so is installed/relinked prior to module-bluetooth-discover.so
This commit is contained in:
Colin Guthrie 2009-02-03 23:49:43 +00:00
parent d1957b8325
commit 871389ac5d

View file

@ -862,6 +862,13 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMIN
# Plug-in libraries # # Plug-in libraries #
################################### ###################################
if HAVE_DBUS
# Serveral module (e.g. libalsa-util.la)
modlibexec_LTLIBRARIES += \
libdbus-util.la \
module-console-kit.la
endif
modlibexec_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-cli.la \ module-cli.la \
module-cli-protocol-tcp.la \ module-cli-protocol-tcp.la \
@ -989,21 +996,14 @@ endif
if HAVE_HAL if HAVE_HAL
modlibexec_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
libdbus-util.la \
module-hal-detect.la module-hal-detect.la
endif endif
if HAVE_DBUS
modlibexec_LTLIBRARIES += \
libdbus-util.la \
module-console-kit.la
endif
if HAVE_BLUEZ if HAVE_BLUEZ
modlibexec_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
libbluetooth-util.la \
module-bluetooth-proximity.la \ module-bluetooth-proximity.la \
module-bluetooth-discover.la \ module-bluetooth-discover.la \
libbluetooth-util.la \
libbluetooth-ipc.la \ libbluetooth-ipc.la \
libbluetooth-sbc.la \ libbluetooth-sbc.la \
module-bluetooth-device.la module-bluetooth-device.la