summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Sturmer Daitx <tdaitx@veio.local>2015-08-27 21:05:17 -0300
committerTiago Sturmer Daitx <tdaitx@veio.local>2015-08-27 21:05:17 -0300
commit355f6af4f59690900445bed586905c5b3a86c364 (patch)
treedefde761bdfa64f8f83d447c6169a50a569e32e5
parent0cb4ed0cdb88373f255bfc94e6b236e444ab24a7 (diff)
downloadbluez-tools-355f6af4f59690900445bed586905c5b3a86c364.tar.gz
Fix AM_LDFLAGS misuse, use LDADD instead
Libraries are wrongly being added to LDFLAGS, they should be set in LIBS or LDADD according to autoconf [1] and automake [2]. This causes failure to build from source (FTBFS) in Ubuntu Wily Proposed as reported in Launchpad #1489661 [3] and Debian #797128. [1] http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Preset-Output-Variables.html#index-LDFLAGS-112 [2] http://www.gnu.org/software/automake/manual/html_node/Linking.html [3] https://bugs.launchpad.net/debian/+source/bluez-tools/+bug/1489661 [4] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=797128
-rw-r--r--src/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 60e224d..cd7d261 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS)
-AM_LDFLAGS = $(GLIB_LIBS) $(GIO_LIBS)
+LDADD = $(GLIB_LIBS) $(GIO_LIBS)
bluez_sources = lib/bluez/adapter.c lib/bluez/adapter.h \
lib/bluez/agent_manager.c lib/bluez/agent_manager.h \
@@ -50,6 +50,6 @@ bt_agent_SOURCES = $(lib_sources) $(bluez_sources) bt-agent.c
bt_device_SOURCES = $(lib_sources) $(bluez_sources) bt-device.c
bt_network_SOURCES = $(lib_sources) $(bluez_sources) bt-network.c
bt_obex_SOURCES = $(lib_sources) $(bluez_sources) bt-obex.c
-bt_obex_LDADD = $(LIBREADLINE)
+bt_obex_LDADD = $(LDADD) $(LIBREADLINE)
dist_man_MANS = bt-adapter.1 bt-agent.1 bt-device.1 bt-network.1 bt-obex.1