diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | audio/Makefile.am | 2 | ||||
| -rw-r--r-- | audio/manager.c | 4 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | input/Makefile.am | 2 | ||||
| -rw-r--r-- | input/manager.c | 4 | ||||
| -rw-r--r-- | network/Makefile.am | 2 | ||||
| -rw-r--r-- | network/connection.c | 2 | ||||
| -rw-r--r-- | network/server.c | 2 | ||||
| -rw-r--r-- | plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | serial/Makefile.am | 2 | ||||
| -rw-r--r-- | serial/manager.c | 2 | ||||
| -rw-r--r-- | serial/port.c | 2 | ||||
| -rw-r--r-- | src/Makefile.am (renamed from hcid/Makefile.am) | 6 | ||||
| -rw-r--r-- | src/adapter.c (renamed from hcid/adapter.c) | 0 | ||||
| -rw-r--r-- | src/adapter.h (renamed from hcid/adapter.h) | 0 | ||||
| -rw-r--r-- | src/agent.c (renamed from hcid/agent.c) | 0 | ||||
| -rw-r--r-- | src/agent.h (renamed from hcid/agent.h) | 0 | ||||
| -rw-r--r-- | src/bluetooth.conf (renamed from hcid/bluetooth.conf) | 0 | ||||
| -rw-r--r-- | src/dbus-api.txt (renamed from hcid/dbus-api.txt) | 0 | ||||
| -rw-r--r-- | src/dbus-common.c (renamed from hcid/dbus-common.c) | 0 | ||||
| -rw-r--r-- | src/dbus-common.h (renamed from hcid/dbus-common.h) | 0 | ||||
| -rw-r--r-- | src/dbus-database.c (renamed from hcid/dbus-database.c) | 0 | ||||
| -rw-r--r-- | src/dbus-database.h (renamed from hcid/dbus-database.h) | 0 | ||||
| -rw-r--r-- | src/dbus-hci.c (renamed from hcid/dbus-hci.c) | 0 | ||||
| -rw-r--r-- | src/dbus-hci.h (renamed from hcid/dbus-hci.h) | 0 | ||||
| -rw-r--r-- | src/dbus-service.c (renamed from hcid/dbus-service.c) | 0 | ||||
| -rw-r--r-- | src/dbus-service.h (renamed from hcid/dbus-service.h) | 0 | ||||
| -rw-r--r-- | src/device.c (renamed from hcid/device.c) | 0 | ||||
| -rw-r--r-- | src/device.h (renamed from hcid/device.h) | 0 | ||||
| -rw-r--r-- | src/hcid.8 (renamed from hcid/hcid.8) | 0 | ||||
| -rw-r--r-- | src/hcid.conf (renamed from hcid/hcid.conf) | 0 | ||||
| -rw-r--r-- | src/hcid.conf.5 (renamed from hcid/hcid.conf.5) | 0 | ||||
| -rw-r--r-- | src/hcid.h (renamed from hcid/hcid.h) | 0 | ||||
| -rw-r--r-- | src/kword.c (renamed from hcid/kword.c) | 0 | ||||
| -rw-r--r-- | src/kword.h (renamed from hcid/kword.h) | 0 | ||||
| -rw-r--r-- | src/lexer.l (renamed from hcid/lexer.l) | 0 | ||||
| -rwxr-xr-x | src/list-devices (renamed from hcid/list-devices) | 0 | ||||
| -rw-r--r-- | src/main.c (renamed from hcid/main.c) | 0 | ||||
| -rw-r--r-- | src/manager.c (renamed from hcid/manager.c) | 0 | ||||
| -rw-r--r-- | src/manager.h (renamed from hcid/manager.h) | 0 | ||||
| -rw-r--r-- | src/parser.y (renamed from hcid/parser.y) | 0 | ||||
| -rw-r--r-- | src/plugin.c (renamed from hcid/plugin.c) | 0 | ||||
| -rw-r--r-- | src/plugin.h (renamed from hcid/plugin.h) | 0 | ||||
| -rw-r--r-- | src/sdpd-database.c (renamed from hcid/sdpd-database.c) | 0 | ||||
| -rw-r--r-- | src/sdpd-request.c (renamed from hcid/sdpd-request.c) | 0 | ||||
| -rw-r--r-- | src/sdpd-server.c (renamed from hcid/sdpd-server.c) | 0 | ||||
| -rw-r--r-- | src/sdpd-service.c (renamed from hcid/sdpd-service.c) | 0 | ||||
| -rw-r--r-- | src/sdpd.h (renamed from hcid/sdpd.h) | 0 | ||||
| -rw-r--r-- | src/security.c (renamed from hcid/security.c) | 0 | ||||
| -rw-r--r-- | src/server.c (renamed from hcid/server.c) | 0 | ||||
| -rw-r--r-- | src/server.h (renamed from hcid/server.h) | 0 | ||||
| -rw-r--r-- | src/service-did.xml (renamed from hcid/service-did.xml) | 0 | ||||
| -rw-r--r-- | src/service-ftp.xml (renamed from hcid/service-ftp.xml) | 0 | ||||
| -rw-r--r-- | src/service-opp.xml (renamed from hcid/service-opp.xml) | 0 | ||||
| -rw-r--r-- | src/service-record.dtd (renamed from hcid/service-record.dtd) | 0 | ||||
| -rw-r--r-- | src/service-spp.xml (renamed from hcid/service-spp.xml) | 0 | ||||
| -rwxr-xr-x | src/simple-agent (renamed from hcid/simple-agent) | 0 | ||||
| -rwxr-xr-x | src/simple-service (renamed from hcid/simple-service) | 0 | ||||
| -rw-r--r-- | src/storage.c (renamed from hcid/storage.c) | 0 | ||||
| -rw-r--r-- | src/telephony.c (renamed from hcid/telephony.c) | 0 | ||||
| -rw-r--r-- | src/telephony.h (renamed from hcid/telephony.h) | 0 | ||||
| -rwxr-xr-x | src/test-adapter (renamed from hcid/test-adapter) | 0 | ||||
| -rwxr-xr-x | src/test-device (renamed from hcid/test-device) | 0 | ||||
| -rwxr-xr-x | src/test-discovery (renamed from hcid/test-discovery) | 0 | ||||
| -rwxr-xr-x | src/test-manager (renamed from hcid/test-manager) | 0 |
66 files changed, 20 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index 2b0708bc0..f372db022 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 0c6acfabd..bd54e9cba 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 cb33158a4..b1da8426b 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 54e9a5f57..9e77f1447 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 1bc81fbee..44f416e3a 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 6e53779e0..086096015 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 15208f5ab..71291d933 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 d0b60c823..a25beb289 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 e94964aec..1f57a174d 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 a8e833d0b..d88d9db63 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 0e6c47f73..ef215e4c9 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 06445dcb4..79d7cb8e7 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 7edd5301c..57475c563 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 e9d93a30d..4e8a93182 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 cb2eba0a4..cb2eba0a4 100644 --- a/hcid/adapter.c +++ b/src/adapter.c diff --git a/hcid/adapter.h b/src/adapter.h index 27da5cfaa..27da5cfaa 100644 --- a/hcid/adapter.h +++ b/src/adapter.h diff --git a/hcid/agent.c b/src/agent.c index 3cae00a5d..3cae00a5d 100644 --- a/hcid/agent.c +++ b/src/agent.c diff --git a/hcid/agent.h b/src/agent.h index 291e7a158..291e7a158 100644 --- a/hcid/agent.h +++ b/src/agent.h diff --git a/hcid/bluetooth.conf b/src/bluetooth.conf index 88545fac9..88545fac9 100644 --- a/hcid/bluetooth.conf +++ b/src/bluetooth.conf diff --git a/hcid/dbus-api.txt b/src/dbus-api.txt index 622477bee..622477bee 100644 --- a/hcid/dbus-api.txt +++ b/src/dbus-api.txt diff --git a/hcid/dbus-common.c b/src/dbus-common.c index 02edd6835..02edd6835 100644 --- a/hcid/dbus-common.c +++ b/src/dbus-common.c diff --git a/hcid/dbus-common.h b/src/dbus-common.h index 8e009f704..8e009f704 100644 --- a/hcid/dbus-common.h +++ b/src/dbus-common.h diff --git a/hcid/dbus-database.c b/src/dbus-database.c index 46b1cbdeb..46b1cbdeb 100644 --- a/hcid/dbus-database.c +++ b/src/dbus-database.c diff --git a/hcid/dbus-database.h b/src/dbus-database.h index 2f5606fca..2f5606fca 100644 --- a/hcid/dbus-database.h +++ b/src/dbus-database.h diff --git a/hcid/dbus-hci.c b/src/dbus-hci.c index e499aca29..e499aca29 100644 --- a/hcid/dbus-hci.c +++ b/src/dbus-hci.c diff --git a/hcid/dbus-hci.h b/src/dbus-hci.h index f141d664c..f141d664c 100644 --- a/hcid/dbus-hci.h +++ b/src/dbus-hci.h diff --git a/hcid/dbus-service.c b/src/dbus-service.c index a85c3d8a8..a85c3d8a8 100644 --- a/hcid/dbus-service.c +++ b/src/dbus-service.c diff --git a/hcid/dbus-service.h b/src/dbus-service.h index 374f9008b..374f9008b 100644 --- a/hcid/dbus-service.h +++ b/src/dbus-service.h diff --git a/hcid/device.c b/src/device.c index 9d9e03b84..9d9e03b84 100644 --- a/hcid/device.c +++ b/src/device.c diff --git a/hcid/device.h b/src/device.h index 31480a663..31480a663 100644 --- a/hcid/device.h +++ b/src/device.h diff --git a/hcid/hcid.8 b/src/hcid.8 index a7ab04107..a7ab04107 100644 --- a/hcid/hcid.8 +++ b/src/hcid.8 diff --git a/hcid/hcid.conf b/src/hcid.conf index b6ce3b481..b6ce3b481 100644 --- a/hcid/hcid.conf +++ b/src/hcid.conf diff --git a/hcid/hcid.conf.5 b/src/hcid.conf.5 index cb5bcfa9d..cb5bcfa9d 100644 --- a/hcid/hcid.conf.5 +++ b/src/hcid.conf.5 diff --git a/hcid/hcid.h b/src/hcid.h index 2dd522f7d..2dd522f7d 100644 --- a/hcid/hcid.h +++ b/src/hcid.h diff --git a/hcid/kword.c b/src/kword.c index 3a89e5a35..3a89e5a35 100644 --- a/hcid/kword.c +++ b/src/kword.c diff --git a/hcid/kword.h b/src/kword.h index ac4781cc0..ac4781cc0 100644 --- a/hcid/kword.h +++ b/src/kword.h diff --git a/hcid/lexer.l b/src/lexer.l index 768a07833..768a07833 100644 --- a/hcid/lexer.l +++ b/src/lexer.l diff --git a/hcid/list-devices b/src/list-devices index ec6c580a3..ec6c580a3 100755 --- a/hcid/list-devices +++ b/src/list-devices diff --git a/hcid/main.c b/src/main.c index fbd776a6d..fbd776a6d 100644 --- a/hcid/main.c +++ b/src/main.c diff --git a/hcid/manager.c b/src/manager.c index 4f638566a..4f638566a 100644 --- a/hcid/manager.c +++ b/src/manager.c diff --git a/hcid/manager.h b/src/manager.h index 99bc26c30..99bc26c30 100644 --- a/hcid/manager.h +++ b/src/manager.h diff --git a/hcid/parser.y b/src/parser.y index c8b9a12d6..c8b9a12d6 100644 --- a/hcid/parser.y +++ b/src/parser.y diff --git a/hcid/plugin.c b/src/plugin.c index 331a832f4..331a832f4 100644 --- a/hcid/plugin.c +++ b/src/plugin.c diff --git a/hcid/plugin.h b/src/plugin.h index 9248aab6b..9248aab6b 100644 --- a/hcid/plugin.h +++ b/src/plugin.h diff --git a/hcid/sdpd-database.c b/src/sdpd-database.c index 6cc34bd35..6cc34bd35 100644 --- a/hcid/sdpd-database.c +++ b/src/sdpd-database.c diff --git a/hcid/sdpd-request.c b/src/sdpd-request.c index ece8cd540..ece8cd540 100644 --- a/hcid/sdpd-request.c +++ b/src/sdpd-request.c diff --git a/hcid/sdpd-server.c b/src/sdpd-server.c index 1524d1c01..1524d1c01 100644 --- a/hcid/sdpd-server.c +++ b/src/sdpd-server.c diff --git a/hcid/sdpd-service.c b/src/sdpd-service.c index 09459f43c..09459f43c 100644 --- a/hcid/sdpd-service.c +++ b/src/sdpd-service.c diff --git a/hcid/sdpd.h b/src/sdpd.h index 332b434d9..332b434d9 100644 --- a/hcid/sdpd.h +++ b/src/sdpd.h diff --git a/hcid/security.c b/src/security.c index 0bfbcbec0..0bfbcbec0 100644 --- a/hcid/security.c +++ b/src/security.c diff --git a/hcid/server.c b/src/server.c index da2401122..da2401122 100644 --- a/hcid/server.c +++ b/src/server.c diff --git a/hcid/server.h b/src/server.h index f60ab88bd..f60ab88bd 100644 --- a/hcid/server.h +++ b/src/server.h diff --git a/hcid/service-did.xml b/src/service-did.xml index 52eb68c02..52eb68c02 100644 --- a/hcid/service-did.xml +++ b/src/service-did.xml diff --git a/hcid/service-ftp.xml b/src/service-ftp.xml index 1bda8857f..1bda8857f 100644 --- a/hcid/service-ftp.xml +++ b/src/service-ftp.xml diff --git a/hcid/service-opp.xml b/src/service-opp.xml index 351b4a410..351b4a410 100644 --- a/hcid/service-opp.xml +++ b/src/service-opp.xml diff --git a/hcid/service-record.dtd b/src/service-record.dtd index f53be5d05..f53be5d05 100644 --- a/hcid/service-record.dtd +++ b/src/service-record.dtd diff --git a/hcid/service-spp.xml b/src/service-spp.xml index 2b156c3f0..2b156c3f0 100644 --- a/hcid/service-spp.xml +++ b/src/service-spp.xml diff --git a/hcid/simple-agent b/src/simple-agent index 0d3dc1f75..0d3dc1f75 100755 --- a/hcid/simple-agent +++ b/src/simple-agent diff --git a/hcid/simple-service b/src/simple-service index 5279a3a6d..5279a3a6d 100755 --- a/hcid/simple-service +++ b/src/simple-service diff --git a/hcid/storage.c b/src/storage.c index ded9a535b..ded9a535b 100644 --- a/hcid/storage.c +++ b/src/storage.c diff --git a/hcid/telephony.c b/src/telephony.c index f68b97deb..f68b97deb 100644 --- a/hcid/telephony.c +++ b/src/telephony.c diff --git a/hcid/telephony.h b/src/telephony.h index b360a621f..b360a621f 100644 --- a/hcid/telephony.h +++ b/src/telephony.h diff --git a/hcid/test-adapter b/src/test-adapter index a4612257e..a4612257e 100755 --- a/hcid/test-adapter +++ b/src/test-adapter diff --git a/hcid/test-device b/src/test-device index 05a23d37f..05a23d37f 100755 --- a/hcid/test-device +++ b/src/test-device diff --git a/hcid/test-discovery b/src/test-discovery index 874de66fc..874de66fc 100755 --- a/hcid/test-discovery +++ b/src/test-discovery diff --git a/hcid/test-manager b/src/test-manager index 759b6a48f..759b6a48f 100755 --- a/hcid/test-manager +++ b/src/test-manager |