On Fri, 5 Aug 2011 16:09:17 +0200 Antonio Ospite <ospite@xxxxxxxxxxxxxxxxx> wrote: > Don't link bluetoothd to udev unconditionally, but only when it is > needed. For now bluetoothd needs to be linked to udev only when the > sixaxis plugin is enabled. Any comment on this change? If it looks OK I'll fold it in v5. Thanks, Antonio > --- > Makefile.am | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index dbe0170..219ca0f 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -288,7 +288,11 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \ > src/event.h src/event.c \ > src/oob.h src/oob.c src/eir.h src/eir.c > src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ \ > - @CAPNG_LIBS@ @UDEV_LIBS@ -ldl -lrt > + @CAPNG_LIBS@ -ldl -lrt > +if SIXAXISPLUGIN > +src_bluetoothd_LDADD += @UDEV_LIBS@ > +endif > + > src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \ > -Wl,--version-script=$(srcdir)/src/bluetooth.ver > > -- > 1.7.5.4 > > -- Antonio Ospite http://ao2.it PGP public key ID: 0x4553B001 A: Because it messes up the order in which people normally read text. See http://en.wikipedia.org/wiki/Posting_style Q: Why is top-posting such a bad thing?
Attachment:
pgpo7doOVu4g4.pgp
Description: PGP signature
