Move hcid to src directory and rename it to bluetoothd

diff --git a/Makefile.am b/Makefile.am
index 2b0708b..f372db0 100644 (file)
--- 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 0c6acfa..bd54e9c 100644 (file)
--- 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 cb33158..b1da842 100644 (file)
--- 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 54e9a5f..9e77f14 100644 (file)
--- 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 1bc81fb..44f416e 100644 (file)
--- 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 6e53779..0860960 100644 (file)
--- 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 15208f5..71291d9 100644 (file)
--- 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 d0b60c8..a25beb2 100644 (file)
--- 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 e94964a..1f57a17 100644 (file)
--- 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 a8e833d..d88d9db 100644 (file)
--- 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 0e6c47f..ef215e4 100644 (file)
--- 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 06445dc..79d7cb8 100644 (file)
--- 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 7edd530..57475c5 100644 (file)
--- 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
similarity index 91%
rename from hcid/Makefile.am
rename to src/Makefile.am
index e9d93a3..4e8a931 100644 (file)
--- 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
similarity index 100%
rename from hcid/adapter.c
rename to src/adapter.c

diff --git a/hcid/adapter.h b/src/adapter.h
similarity index 100%
rename from hcid/adapter.h
rename to src/adapter.h

diff --git a/hcid/agent.c b/src/agent.c
similarity index 100%
rename from hcid/agent.c
rename to src/agent.c

diff --git a/hcid/agent.h b/src/agent.h
similarity index 100%
rename from hcid/agent.h
rename to src/agent.h

diff --git a/hcid/bluetooth.conf b/src/bluetooth.conf
similarity index 100%
rename from hcid/bluetooth.conf
rename to src/bluetooth.conf

diff --git a/hcid/dbus-api.txt b/src/dbus-api.txt
similarity index 100%
rename from hcid/dbus-api.txt
rename to src/dbus-api.txt

diff --git a/hcid/dbus-common.c b/src/dbus-common.c
similarity index 100%
rename from hcid/dbus-common.c
rename to src/dbus-common.c

diff --git a/hcid/dbus-common.h b/src/dbus-common.h
similarity index 100%
rename from hcid/dbus-common.h
rename to src/dbus-common.h

diff --git a/hcid/dbus-database.c b/src/dbus-database.c
similarity index 100%
rename from hcid/dbus-database.c
rename to src/dbus-database.c

diff --git a/hcid/dbus-database.h b/src/dbus-database.h
similarity index 100%
rename from hcid/dbus-database.h
rename to src/dbus-database.h

diff --git a/hcid/dbus-hci.c b/src/dbus-hci.c
similarity index 100%
rename from hcid/dbus-hci.c
rename to src/dbus-hci.c

diff --git a/hcid/dbus-hci.h b/src/dbus-hci.h
similarity index 100%
rename from hcid/dbus-hci.h
rename to src/dbus-hci.h

diff --git a/hcid/dbus-service.c b/src/dbus-service.c
similarity index 100%
rename from hcid/dbus-service.c
rename to src/dbus-service.c

diff --git a/hcid/dbus-service.h b/src/dbus-service.h
similarity index 100%
rename from hcid/dbus-service.h
rename to src/dbus-service.h

diff --git a/hcid/device.c b/src/device.c
similarity index 100%
rename from hcid/device.c
rename to src/device.c

diff --git a/hcid/device.h b/src/device.h
similarity index 100%
rename from hcid/device.h
rename to src/device.h

diff --git a/hcid/hcid.8 b/src/hcid.8
similarity index 100%
rename from hcid/hcid.8
rename to src/hcid.8

diff --git a/hcid/hcid.conf b/src/hcid.conf
similarity index 100%
rename from hcid/hcid.conf
rename to src/hcid.conf

diff --git a/hcid/hcid.conf.5 b/src/hcid.conf.5
similarity index 100%
rename from hcid/hcid.conf.5
rename to src/hcid.conf.5

diff --git a/hcid/hcid.h b/src/hcid.h
similarity index 100%
rename from hcid/hcid.h
rename to src/hcid.h

diff --git a/hcid/kword.c b/src/kword.c
similarity index 100%
rename from hcid/kword.c
rename to src/kword.c

diff --git a/hcid/kword.h b/src/kword.h
similarity index 100%
rename from hcid/kword.h
rename to src/kword.h

diff --git a/hcid/lexer.l b/src/lexer.l
similarity index 100%
rename from hcid/lexer.l
rename to src/lexer.l

diff --git a/hcid/list-devices b/src/list-devices
similarity index 100%
rename from hcid/list-devices
rename to src/list-devices

diff --git a/hcid/main.c b/src/main.c
similarity index 100%
rename from hcid/main.c
rename to src/main.c

diff --git a/hcid/manager.c b/src/manager.c
similarity index 100%
rename from hcid/manager.c
rename to src/manager.c

diff --git a/hcid/manager.h b/src/manager.h
similarity index 100%
rename from hcid/manager.h
rename to src/manager.h

diff --git a/hcid/parser.y b/src/parser.y
similarity index 100%
rename from hcid/parser.y
rename to src/parser.y

diff --git a/hcid/plugin.c b/src/plugin.c
similarity index 100%
rename from hcid/plugin.c
rename to src/plugin.c

diff --git a/hcid/plugin.h b/src/plugin.h
similarity index 100%
rename from hcid/plugin.h
rename to src/plugin.h

diff --git a/hcid/sdpd-database.c b/src/sdpd-database.c
similarity index 100%
rename from hcid/sdpd-database.c
rename to src/sdpd-database.c

diff --git a/hcid/sdpd-request.c b/src/sdpd-request.c
similarity index 100%
rename from hcid/sdpd-request.c
rename to src/sdpd-request.c

diff --git a/hcid/sdpd-server.c b/src/sdpd-server.c
similarity index 100%
rename from hcid/sdpd-server.c
rename to src/sdpd-server.c

diff --git a/hcid/sdpd-service.c b/src/sdpd-service.c
similarity index 100%
rename from hcid/sdpd-service.c
rename to src/sdpd-service.c

diff --git a/hcid/sdpd.h b/src/sdpd.h
similarity index 100%
rename from hcid/sdpd.h
rename to src/sdpd.h

diff --git a/hcid/security.c b/src/security.c
similarity index 100%
rename from hcid/security.c
rename to src/security.c

diff --git a/hcid/server.c b/src/server.c
similarity index 100%
rename from hcid/server.c
rename to src/server.c

diff --git a/hcid/server.h b/src/server.h
similarity index 100%
rename from hcid/server.h
rename to src/server.h

diff --git a/hcid/service-did.xml b/src/service-did.xml
similarity index 100%
rename from hcid/service-did.xml
rename to src/service-did.xml

diff --git a/hcid/service-ftp.xml b/src/service-ftp.xml
similarity index 100%
rename from hcid/service-ftp.xml
rename to src/service-ftp.xml

diff --git a/hcid/service-opp.xml b/src/service-opp.xml
similarity index 100%
rename from hcid/service-opp.xml
rename to src/service-opp.xml

diff --git a/hcid/service-record.dtd b/src/service-record.dtd
similarity index 100%
rename from hcid/service-record.dtd
rename to src/service-record.dtd

diff --git a/hcid/service-spp.xml b/src/service-spp.xml
similarity index 100%
rename from hcid/service-spp.xml
rename to src/service-spp.xml

diff --git a/hcid/simple-agent b/src/simple-agent
similarity index 100%
rename from hcid/simple-agent
rename to src/simple-agent

diff --git a/hcid/simple-service b/src/simple-service
similarity index 100%
rename from hcid/simple-service
rename to src/simple-service

diff --git a/hcid/storage.c b/src/storage.c
similarity index 100%
rename from hcid/storage.c
rename to src/storage.c

diff --git a/hcid/telephony.c b/src/telephony.c
similarity index 100%
rename from hcid/telephony.c
rename to src/telephony.c

diff --git a/hcid/telephony.h b/src/telephony.h
similarity index 100%
rename from hcid/telephony.h
rename to src/telephony.h

diff --git a/hcid/test-adapter b/src/test-adapter
similarity index 100%
rename from hcid/test-adapter
rename to src/test-adapter

diff --git a/hcid/test-device b/src/test-device
similarity index 100%
rename from hcid/test-device
rename to src/test-device

diff --git a/hcid/test-discovery b/src/test-discovery
similarity index 100%
rename from hcid/test-discovery
rename to src/test-discovery

diff --git a/hcid/test-manager b/src/test-manager
similarity index 100%
rename from hcid/test-manager
rename to src/test-manager