Move the BtIO code into the daemon

6 files changed, 3 insertions, 11 deletions

diff --git a/Makefile.am b/Makefile.am
index 300cee6..79b1c45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = gwobex gdbus btio src plugins client test doc
+SUBDIRS = gwobex gdbus src plugins client test doc
 
 AM_MAKEFLAGS = --no-print-directory
 
diff --git a/btio/Makefile.am b/btio/Makefile.am
deleted file mode 100644
index b8c17c3..0000000
--- a/btio/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-noinst_LTLIBRARIES = libbtio.la
-
-libbtio_la_SOURCES = btio.h btio.c
-
-AM_CFLAGS = @GLIB_CFLAGS@
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/configure.ac b/configure.ac
index f38b0ac..df6cff1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,5 +143,5 @@ AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client],
 ])
 AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
 
-AC_OUTPUT(Makefile gwobex/Makefile gdbus/Makefile btio/Makefile src/Makefile
+AC_OUTPUT(Makefile gwobex/Makefile gdbus/Makefile src/Makefile
 		plugins/Makefile client/Makefile test/Makefile doc/Makefile)
diff --git a/src/Makefile.am b/src/Makefile.am
index 605862b..24c8f41 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ service_DATA = $(service_in_files:.service.in=.service)
 
 libexec_PROGRAMS = obexd
 
-obexd_SOURCES = main.c obexd.h plugin.h plugin.c manager.c \
+obexd_SOURCES = main.c obexd.h plugin.h plugin.c manager.c btio.h btio.c \
 		logging.h logging.c obex.h obex.c opp.c ftp.c pbap.c \
 		bluetooth.h bluetooth.c phonebook.h phonebook.c dbus.h
 
diff --git a/btio/btio.c b/src/btio.c
index 1650de5..1650de5 100644
--- a/btio/btio.c
+++ b/src/btio.c
diff --git a/btio/btio.h b/src/btio.h
index 2e50d98..2e50d98 100644
--- a/btio/btio.h
+++ b/src/btio.h