diff options
author | Colin Guthrie <pulse@colin.guthr.ie> | 2009-02-03 23:49:43 +0000 |
---|---|---|
committer | Colin Guthrie <pulse@colin.guthr.ie> | 2009-02-03 23:49:43 +0000 |
commit | 871389ac5d89d7979819ca677efaaad8e80bf6d1 (patch) | |
tree | faa06191aba9bead5112e56f61fb5e51bb74b543 /src/Makefile.am | |
parent | d1957b8325dc66ac6f691b13c8408e820685248a (diff) |
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
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d2917a0c..1910a82e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -862,6 +862,13 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMIN # 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 += \ module-cli.la \ module-cli-protocol-tcp.la \ @@ -989,21 +996,14 @@ endif if HAVE_HAL modlibexec_LTLIBRARIES += \ - libdbus-util.la \ module-hal-detect.la endif -if HAVE_DBUS -modlibexec_LTLIBRARIES += \ - libdbus-util.la \ - module-console-kit.la -endif - if HAVE_BLUEZ modlibexec_LTLIBRARIES += \ + libbluetooth-util.la \ module-bluetooth-proximity.la \ module-bluetooth-discover.la \ - libbluetooth-util.la \ libbluetooth-ipc.la \ libbluetooth-sbc.la \ module-bluetooth-device.la |