Move hcid to src directory and rename it to bluetoothd

66 files changed, 20 insertions, 20 deletions

diff --git a/Makefile.am b/Makefile.am
index 2b0708bc..f372db02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 
 SUBDIRS = include lib doc \
-		sbc gdbus common hcid plugins \
+		sbc gdbus common src plugins \
 		network serial input audio \
 		tools rfcomm dund pand hidd \
 		cups test scripts
diff --git a/audio/Makefile.am b/audio/Makefile.am
index 0c6acfab..bd54e9cb 100644
--- a/audio/Makefile.am
+++ b/audio/Makefile.am
@@ -55,7 +55,7 @@ endif
 
 AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
 
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid -I$(top_srcdir)/sdpd
+INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
 
 EXTRA_DIST = audio.conf audio-api.txt test-audio asound.conf
 
diff --git a/audio/manager.c b/audio/manager.c
index cb33158a..b1da8426 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -49,8 +49,8 @@
 #include <gdbus.h>
 
 #include "glib-helper.h"
-#include "../hcid/adapter.h"
-#include "../hcid/device.h"
+#include "../src/adapter.h"
+#include "../src/device.h"
 
 #include "dbus-service.h"
 #include "logging.h"
diff --git a/configure.in b/configure.in
index 54e9a5f5..9e77f144 100644
--- a/configure.in
+++ b/configure.in
@@ -39,10 +39,11 @@ AC_OUTPUT([
 	Makefile
 	include/Makefile
 	lib/Makefile
-	doc/Makefile
-	sbc/Makefile
 	gdbus/Makefile
 	common/Makefile
+	src/Makefile
+	doc/Makefile
+	sbc/Makefile
 	plugins/Makefile
 	network/Makefile
 	serial/Makefile
@@ -50,7 +51,6 @@ AC_OUTPUT([
 	audio/Makefile
 	tools/Makefile
 	rfcomm/Makefile
-	hcid/Makefile
 	dund/Makefile
 	pand/Makefile
 	hidd/Makefile
diff --git a/input/Makefile.am b/input/Makefile.am
index 1bc81fbe..44f416e3 100644
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -17,7 +17,7 @@ AM_LDFLAGS = -module -avoid-version -no-undefined \
 
 AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
 
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid
+INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
 
 EXTRA_DIST = input.conf input-api.txt test-input
 
diff --git a/input/manager.c b/input/manager.c
index 6e53779e..08609601 100644
--- a/input/manager.c
+++ b/input/manager.c
@@ -44,8 +44,8 @@
 
 #include "logging.h"
 #include "textfile.h"
-#include "../hcid/adapter.h"
-#include "../hcid/device.h"
+#include "../src/adapter.h"
+#include "../src/device.h"
 
 #include "device.h"
 #include "server.h"
diff --git a/network/Makefile.am b/network/Makefile.am
index 15208f5a..71291d93 100644
--- a/network/Makefile.am
+++ b/network/Makefile.am
@@ -17,7 +17,7 @@ AM_LDFLAGS = -module -avoid-version -no-undefined \
 
 AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
 
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid -I$(top_srcdir)/sdpd
+INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
 
 EXTRA_DIST = network.conf network-api.txt test-network
 
diff --git a/network/connection.c b/network/connection.c
index d0b60c82..a25beb28 100644
--- a/network/connection.c
+++ b/network/connection.c
@@ -42,7 +42,7 @@
 #include <glib.h>
 #include <gdbus.h>
 
-#include "../hcid/dbus-common.h"
+#include "../src/dbus-common.h"
 
 #include "logging.h"
 #include "textfile.h"
diff --git a/network/server.c b/network/server.c
index e94964ae..1f57a174 100644
--- a/network/server.c
+++ b/network/server.c
@@ -46,7 +46,7 @@
 #include <glib.h>
 #include <gdbus.h>
 
-#include "../hcid/dbus-common.h"
+#include "../src/dbus-common.h"
 
 #include "logging.h"
 #include "error.h"
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a8e833d0..d88d9db6 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -26,7 +26,7 @@ AM_LDFLAGS = -module -avoid-version -no-undefined \
 
 AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ @NETLINK_CFLAGS@
 
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid
+INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/serial/Makefile.am b/serial/Makefile.am
index 0e6c47f7..ef215e4c 100644
--- a/serial/Makefile.am
+++ b/serial/Makefile.am
@@ -17,7 +17,7 @@ AM_LDFLAGS = -module -avoid-version -no-undefined \
 
 AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
 
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid -I$(top_srcdir)/sdpd
+INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
 
 EXTRA_DIST = serial-api.txt test-serial
 
diff --git a/serial/manager.c b/serial/manager.c
index 06445dcb..79d7cb8e 100644
--- a/serial/manager.c
+++ b/serial/manager.c
@@ -51,7 +51,7 @@
 #include <glib.h>
 #include <gdbus.h>
 
-#include "../hcid/dbus-common.h"
+#include "../src/dbus-common.h"
 #include "adapter.h"
 #include "device.h"
 
diff --git a/serial/port.c b/serial/port.c
index 7edd5301..57475c56 100644
--- a/serial/port.c
+++ b/serial/port.c
@@ -44,7 +44,7 @@
 #include <glib.h>
 #include <gdbus.h>
 
-#include "../hcid/dbus-common.h"
+#include "../src/dbus-common.h"
 
 #include "logging.h"
 #include "glib-helper.h"
diff --git a/hcid/Makefile.am b/src/Makefile.am
index e9d93a30..4e8a9318 100644
--- a/hcid/Makefile.am
+++ b/src/Makefile.am
@@ -13,9 +13,9 @@ statedir = $(localstatedir)/lib/bluetooth
 state_DATA =
 endif
 
-sbin_PROGRAMS = hcid
+sbin_PROGRAMS = bluetoothd
 
-hcid_SOURCES = main.c hcid.h sdpd.h \
+bluetoothd_SOURCES = main.c hcid.h sdpd.h \
 	sdpd-server.c sdpd-request.c sdpd-service.c \
 	sdpd-database.c security.c storage.c \
 	parser.h parser.y lexer.l kword.c kword.h \
@@ -26,7 +26,7 @@ hcid_SOURCES = main.c hcid.h sdpd.h \
 	dbus-hci.h dbus-hci.c \
 	telephony.h telephony.c agent.h agent.c
 
-hcid_LDADD = $(top_builddir)/common/libhelper.a \
+bluetoothd_LDADD = $(top_builddir)/common/libhelper.a \
 	@GDBUS_LIBS@ @GMODULE_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
 
 if MAINTAINER_MODE
diff --git a/hcid/adapter.c b/src/adapter.c
index cb2eba0a..cb2eba0a 100644
--- a/hcid/adapter.c
+++ b/src/adapter.c
diff --git a/hcid/adapter.h b/src/adapter.h
index 27da5cfa..27da5cfa 100644
--- a/hcid/adapter.h
+++ b/src/adapter.h
diff --git a/hcid/agent.c b/src/agent.c
index 3cae00a5..3cae00a5 100644
--- a/hcid/agent.c
+++ b/src/agent.c
diff --git a/hcid/agent.h b/src/agent.h
index 291e7a15..291e7a15 100644
--- a/hcid/agent.h
+++ b/src/agent.h
diff --git a/hcid/bluetooth.conf b/src/bluetooth.conf
index 88545fac..88545fac 100644
--- a/hcid/bluetooth.conf
+++ b/src/bluetooth.conf
diff --git a/hcid/dbus-api.txt b/src/dbus-api.txt
index 622477be..622477be 100644
--- a/hcid/dbus-api.txt
+++ b/src/dbus-api.txt
diff --git a/hcid/dbus-common.c b/src/dbus-common.c
index 02edd683..02edd683 100644
--- a/hcid/dbus-common.c
+++ b/src/dbus-common.c
diff --git a/hcid/dbus-common.h b/src/dbus-common.h
index 8e009f70..8e009f70 100644
--- a/hcid/dbus-common.h
+++ b/src/dbus-common.h
diff --git a/hcid/dbus-database.c b/src/dbus-database.c
index 46b1cbde..46b1cbde 100644
--- a/hcid/dbus-database.c
+++ b/src/dbus-database.c
diff --git a/hcid/dbus-database.h b/src/dbus-database.h
index 2f5606fc..2f5606fc 100644
--- a/hcid/dbus-database.h
+++ b/src/dbus-database.h
diff --git a/hcid/dbus-hci.c b/src/dbus-hci.c
index e499aca2..e499aca2 100644
--- a/hcid/dbus-hci.c
+++ b/src/dbus-hci.c
diff --git a/hcid/dbus-hci.h b/src/dbus-hci.h
index f141d664..f141d664 100644
--- a/hcid/dbus-hci.h
+++ b/src/dbus-hci.h
diff --git a/hcid/dbus-service.c b/src/dbus-service.c
index a85c3d8a..a85c3d8a 100644
--- a/hcid/dbus-service.c
+++ b/src/dbus-service.c
diff --git a/hcid/dbus-service.h b/src/dbus-service.h
index 374f9008..374f9008 100644
--- a/hcid/dbus-service.h
+++ b/src/dbus-service.h
diff --git a/hcid/device.c b/src/device.c
index 9d9e03b8..9d9e03b8 100644
--- a/hcid/device.c
+++ b/src/device.c
diff --git a/hcid/device.h b/src/device.h
index 31480a66..31480a66 100644
--- a/hcid/device.h
+++ b/src/device.h
diff --git a/hcid/hcid.8 b/src/hcid.8
index a7ab0410..a7ab0410 100644
--- a/hcid/hcid.8
+++ b/src/hcid.8
diff --git a/hcid/hcid.conf b/src/hcid.conf
index b6ce3b48..b6ce3b48 100644
--- a/hcid/hcid.conf
+++ b/src/hcid.conf
diff --git a/hcid/hcid.conf.5 b/src/hcid.conf.5
index cb5bcfa9..cb5bcfa9 100644
--- a/hcid/hcid.conf.5
+++ b/src/hcid.conf.5
diff --git a/hcid/hcid.h b/src/hcid.h
index 2dd522f7..2dd522f7 100644
--- a/hcid/hcid.h
+++ b/src/hcid.h
diff --git a/hcid/kword.c b/src/kword.c
index 3a89e5a3..3a89e5a3 100644
--- a/hcid/kword.c
+++ b/src/kword.c
diff --git a/hcid/kword.h b/src/kword.h
index ac4781cc..ac4781cc 100644
--- a/hcid/kword.h
+++ b/src/kword.h
diff --git a/hcid/lexer.l b/src/lexer.l
index 768a0783..768a0783 100644
--- a/hcid/lexer.l
+++ b/src/lexer.l
diff --git a/hcid/list-devices b/src/list-devices
index ec6c580a..ec6c580a 100755
--- a/hcid/list-devices
+++ b/src/list-devices
diff --git a/hcid/main.c b/src/main.c
index fbd776a6..fbd776a6 100644
--- a/hcid/main.c
+++ b/src/main.c
diff --git a/hcid/manager.c b/src/manager.c
index 4f638566..4f638566 100644
--- a/hcid/manager.c
+++ b/src/manager.c
diff --git a/hcid/manager.h b/src/manager.h
index 99bc26c3..99bc26c3 100644
--- a/hcid/manager.h
+++ b/src/manager.h
diff --git a/hcid/parser.y b/src/parser.y
index c8b9a12d..c8b9a12d 100644
--- a/hcid/parser.y
+++ b/src/parser.y
diff --git a/hcid/plugin.c b/src/plugin.c
index 331a832f..331a832f 100644
--- a/hcid/plugin.c
+++ b/src/plugin.c
diff --git a/hcid/plugin.h b/src/plugin.h
index 9248aab6..9248aab6 100644
--- a/hcid/plugin.h
+++ b/src/plugin.h
diff --git a/hcid/sdpd-database.c b/src/sdpd-database.c
index 6cc34bd3..6cc34bd3 100644
--- a/hcid/sdpd-database.c
+++ b/src/sdpd-database.c
diff --git a/hcid/sdpd-request.c b/src/sdpd-request.c
index ece8cd54..ece8cd54 100644
--- a/hcid/sdpd-request.c
+++ b/src/sdpd-request.c
diff --git a/hcid/sdpd-server.c b/src/sdpd-server.c
index 1524d1c0..1524d1c0 100644
--- a/hcid/sdpd-server.c
+++ b/src/sdpd-server.c
diff --git a/hcid/sdpd-service.c b/src/sdpd-service.c
index 09459f43..09459f43 100644
--- a/hcid/sdpd-service.c
+++ b/src/sdpd-service.c
diff --git a/hcid/sdpd.h b/src/sdpd.h
index 332b434d..332b434d 100644
--- a/hcid/sdpd.h
+++ b/src/sdpd.h
diff --git a/hcid/security.c b/src/security.c
index 0bfbcbec..0bfbcbec 100644
--- a/hcid/security.c
+++ b/src/security.c
diff --git a/hcid/server.c b/src/server.c
index da240112..da240112 100644
--- a/hcid/server.c
+++ b/src/server.c
diff --git a/hcid/server.h b/src/server.h
index f60ab88b..f60ab88b 100644
--- a/hcid/server.h
+++ b/src/server.h
diff --git a/hcid/service-did.xml b/src/service-did.xml
index 52eb68c0..52eb68c0 100644
--- a/hcid/service-did.xml
+++ b/src/service-did.xml
diff --git a/hcid/service-ftp.xml b/src/service-ftp.xml
index 1bda8857..1bda8857 100644
--- a/hcid/service-ftp.xml
+++ b/src/service-ftp.xml
diff --git a/hcid/service-opp.xml b/src/service-opp.xml
index 351b4a41..351b4a41 100644
--- a/hcid/service-opp.xml
+++ b/src/service-opp.xml
diff --git a/hcid/service-record.dtd b/src/service-record.dtd
index f53be5d0..f53be5d0 100644
--- a/hcid/service-record.dtd
+++ b/src/service-record.dtd
diff --git a/hcid/service-spp.xml b/src/service-spp.xml
index 2b156c3f..2b156c3f 100644
--- a/hcid/service-spp.xml
+++ b/src/service-spp.xml
diff --git a/hcid/simple-agent b/src/simple-agent
index 0d3dc1f7..0d3dc1f7 100755
--- a/hcid/simple-agent
+++ b/src/simple-agent
diff --git a/hcid/simple-service b/src/simple-service
index 5279a3a6..5279a3a6 100755
--- a/hcid/simple-service
+++ b/src/simple-service
diff --git a/hcid/storage.c b/src/storage.c
index ded9a535..ded9a535 100644
--- a/hcid/storage.c
+++ b/src/storage.c
diff --git a/hcid/telephony.c b/src/telephony.c
index f68b97de..f68b97de 100644
--- a/hcid/telephony.c
+++ b/src/telephony.c
diff --git a/hcid/telephony.h b/src/telephony.h
index b360a621..b360a621 100644
--- a/hcid/telephony.h
+++ b/src/telephony.h
diff --git a/hcid/test-adapter b/src/test-adapter
index a4612257..a4612257 100755
--- a/hcid/test-adapter
+++ b/src/test-adapter
diff --git a/hcid/test-device b/src/test-device
index 05a23d37..05a23d37 100755
--- a/hcid/test-device
+++ b/src/test-device
diff --git a/hcid/test-discovery b/src/test-discovery
index 874de66f..874de66f 100755
--- a/hcid/test-discovery
+++ b/src/test-discovery
diff --git a/hcid/test-manager b/src/test-manager
index 759b6a48..759b6a48 100755
--- a/hcid/test-manager
+++ b/src/test-manager