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 /android | |
| 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 'android')
| -rw-r--r-- | android/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/Makefile.am b/android/Makefile.am index 5dd1adf9d..a370598a2 100644 --- a/android/Makefile.am +++ b/android/Makefile.am @@ -142,7 +142,7 @@ android_haltest_SOURCES = android/client/haltest.c \ android/hal-utils.h android/hal-utils.c android_haltest_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/android \ -DPLUGINDIR=\""$(android_plugindir)"\" -android_haltest_LDFLAGS = -pthread +android_haltest_LDFLAGS = $(AM_LDFLAGS) -pthread android_haltest_LDADD = -ldl -lm noinst_PROGRAMS += android/android-tester @@ -167,7 +167,7 @@ android_android_tester_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/android \ -DPLUGINDIR=\""$(android_plugindir)"\" android_android_tester_LDADD = lib/libbluetooth-internal.la \ src/libshared-glib.la $(GLIB_LIBS) -ldl -android_android_tester_LDFLAGS = -pthread +android_android_tester_LDFLAGS = $(AM_LDFLAGS) -pthread noinst_PROGRAMS += android/ipc-tester |