summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile.tools11
-rw-r--r--tools/btiotest.c (renamed from test/btiotest.c)0
3 files changed, 7 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 3a3e027d4..1142092e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,9 +53,9 @@ tools/scotest
tools/sdptool
tools/avtest
tools/bdaddr
+tools/btiotest
test/agent
test/gaptest
-test/btiotest
test/mpris-player
test/sap_client.pyc
test/bluezutils.pyc
diff --git a/Makefile.tools b/Makefile.tools
index fedb9a1ae..52a286085 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -8,7 +8,8 @@ bin_PROGRAMS += tools/rfcomm tools/l2ping tools/l2test tools/rctest \
noinst_PROGRAMS += tools/avinfo tools/avtest tools/scotest \
tools/hcieventmask tools/hcisecfilter \
tools/btmgmt tools/btattach tools/btsnoop \
- monitor/btmon emulator/btvirt emulator/b1ee
+ monitor/btmon emulator/btvirt emulator/b1ee \
+ tools/btiotest
tools_rfcomm_LDADD = lib/libbluetooth-private.la
@@ -90,6 +91,9 @@ tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
tools_obex_server_tool_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
endif
+tools_btiotest_SOURCES = tools/btiotest.c btio/btio.h btio/btio.c
+tools_btiotest_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
+
tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
tools/csr_hci.c tools/csr_h4.c tools/csr_3wire.c \
tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
@@ -144,15 +148,12 @@ endif
if TEST
-noinst_PROGRAMS += test/gaptest test/agent test/btiotest test/mpris-player
+noinst_PROGRAMS += test/gaptest test/agent test/mpris-player
test_gaptest_LDADD = @DBUS_LIBS@
test_agent_LDADD = @DBUS_LIBS@
-test_btiotest_SOURCES = test/btiotest.c btio/btio.h btio/btio.c
-test_btiotest_LDADD = @GLIB_LIBS@ lib/libbluetooth-private.la
-
test_mpris_player_SOURCES = test/mpris-player.c
test_mpris_player_LDADD = @DBUS_LIBS@ @GLIB_LIBS@
endif
diff --git a/test/btiotest.c b/tools/btiotest.c
index 4b170ace5..4b170ace5 100644
--- a/test/btiotest.c
+++ b/tools/btiotest.c