summaryrefslogtreecommitdiff
path: root/Makefile.tools
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2013-08-12 14:57:33 +0300
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2013-08-20 13:15:49 +0300
commitea2e42acca6bd59b5bdc0ab283dbc6e0a2a74c5f (patch)
treeb6afd008d8d87a5e6b656667d06270a10afa6644 /Makefile.tools
parent303b8b7757fc5c755ceeabe025cfc92a90bd694b (diff)
downloadbluez-ea2e42acca6bd59b5bdc0ab283dbc6e0a2a74c5f.tar.gz
build: Fix not checking readline.h for bluetooth-player
If --disable-client is passed to configure script is possible to build BlueZ without readline which would cause the following error: tools/bluetooth-player.c:36:31: fatal error: readline/readline.h: No such file or directory #include <readline/readline.h> ^
Diffstat (limited to 'Makefile.tools')
-rw-r--r--Makefile.tools16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.tools b/Makefile.tools
index 3bb0e8285..4bcb18e39 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -172,8 +172,7 @@ if EXPERIMENTAL
noinst_PROGRAMS += tools/bdaddr tools/avinfo tools/avtest tools/scotest \
tools/hcieventmask tools/hcisecfilter tools/hwdb \
tools/btmgmt tools/btattach tools/btsnoop \
- tools/btiotest tools/mpris-player \
- tools/bluetooth-player
+ tools/btiotest tools/mpris-player
tools_bdaddr_SOURCES = tools/bdaddr.c src/oui.h src/oui.c
tools_bdaddr_LDADD = lib/libbluetooth-internal.la @UDEV_LIBS@
@@ -199,17 +198,13 @@ tools_btiotest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
tools_mpris_player_SOURCES = tools/mpris-player.c
tools_mpris_player_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
-tools_bluetooth_player_SOURCES = tools/bluetooth-player.c \
- client/display.h client/display.c
-tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \
- @GLIB_LIBS@ @DBUS_LIBS@ -lreadline
-
EXTRA_DIST += tools/bdaddr.1
endif
if READLINE
noinst_PROGRAMS += attrib/gatttool \
- tools/obex-client-tool tools/obex-server-tool
+ tools/obex-client-tool tools/obex-server-tool \
+ tools/bluetooth-player
attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
attrib/gattrib.c btio/btio.c \
@@ -226,6 +221,11 @@ tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \
tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
tools/obex-server-tool.c
tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
+
+tools_bluetooth_player_SOURCES = tools/bluetooth-player.c \
+ client/display.h client/display.c
+tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \
+ @GLIB_LIBS@ @DBUS_LIBS@ -lreadline
endif
if EXPERIMENTAL