mirror of
https://git.kernel.org/pub/scm/bluetooth/bluez.git
synced 2024-11-16 08:44:38 +08:00
Move hcid to src directory and rename it to bluetoothd
This commit is contained in:
Marcel Holtmann
parent
6ff0013177
commit
e0581b5e29
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
Loading…
Reference in New Issue
Block a user