diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2018-11-28 16:45:14 +0100 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2018-11-29 13:34:18 +0200 |
| commit | f54325e6813fa03a40304c3c353ad71ca7ec30e9 (patch) | |
| tree | accf610ee1cdefa1230755f92e5ee436f7ff7e76 /Makefile.obexd | |
| parent | d800a11512753ac7d24555862963e23b1516148a (diff) | |
| download | bluez-f54325e6813fa03a40304c3c353ad71ca7ec30e9.tar.gz | |
build: make building with --coverage work again
When `./configure --enable-coverage` is given and lcov is present,
MISC_CFLAGS and MISC_LDFLAGS will be set to --coverage. However,
1. obexd uses per-target LDFLAGS and, in doing so, forget to re-mention
$(AM_LDFLAGS). This problem existed for a long time.
2. obexd uses per-target CFLAGS and, in doing so, forgot to re-mention
$(AM_CFLAGS). This got broken in 06dbb223fbe50acc48b3ba1d33cb424275b4baaa.
This led to no --coverage showing up in the linker line for obexd,
causing a link failure indicating unresolved symbols like
__gcov_exit.
Diffstat (limited to 'Makefile.obexd')
| -rw-r--r-- | Makefile.obexd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.obexd b/Makefile.obexd index 22a4977ef..1c1e500fe 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -81,15 +81,15 @@ obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ gdbus/libgdbus-internal.la \ $(ICAL_LIBS) $(DBUS_LIBS) $(GLIB_LIBS) -ldl -obexd_src_obexd_LDFLAGS = -Wl,--export-dynamic +obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic -obexd_src_obexd_CPPFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ +obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ $(ICAL_CFLAGS) -DOBEX_PLUGIN_BUILTIN \ -DPLUGINDIR=\""$(obex_plugindir)"\" \ -D_FILE_OFFSET_BITS=64 \ -I$(builddir)/lib -I$(builddir)/obexd/src -obexd_src_obexd_CFLAGS = -fPIC +obexd_src_obexd_CFLAGS = $(AM_CFLAGS) -fPIC endif |