korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2025-01-19 19:03:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make all major plugins builtin to simplify debugging

Browse Source
This commit is contained in:
Marcel Holtmann 2009-08-09 14:35:39 -07:00
parent 33f51f71f9
commit f5f61c23d7
8 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -1,7 +1,7 @@
SUBDIRS = include lib sbc gdbus common src client plugins \
network serial input audio tools \
rfcomm compat cups test scripts doc
SUBDIRS = include lib sbc gdbus common \
plugins network serial input audio src \
client tools rfcomm compat cups test scripts doc
EXTRA_DIST = bluez.m4

14
audio/Makefile.am
View File

@ -2,9 +2,7 @@
BUILT_SOURCES = telephony.c
if AUDIOPLUGIN
plugindir = $(libdir)/bluetooth/plugins
plugin_LTLIBRARIES = audio.la
noinst_LTLIBRARIES = audio.la libipc.la
audio_la_SOURCES = main.c \
ipc.h ipc.c unix.h unix.c manager.h manager.c telephony.h \
@ -19,6 +17,8 @@ audio_la_LDFLAGS = -module -avoid-version -no-undefined
LDADD = $(top_builddir)/common/libhelper.a \
@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
libipc_la_SOURCES = ipc.h ipc.c
if ALSA
alsadir = $(libdir)/alsa-lib
@ -61,17 +61,13 @@ libgstbluetooth_la_LIBADD = @SBC_LIBS@ @BLUEZ_LIBS@ @GSTREAMER_LIBS@ \
libgstbluetooth_la_CFLAGS = -fvisibility=hidden -fno-strict-aliasing \
@GSTREAMER_CFLAGS@ @BLUEZ_CFLAGS@ @SBC_CFLAGS@
endif
endif
noinst_LTLIBRARIES = libipc.la
libipc_la_SOURCES = ipc.h ipc.c
noinst_PROGRAMS = ipctest
ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@
endif
AM_CFLAGS = -fvisibility=hidden @SBC_CFLAGS@ \
AM_CFLAGS = -fvisibility=hidden -DBLUETOOTH_PLUGIN_BUILTIN @SBC_CFLAGS@ \
@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
CLEANFILES = $(BUILT_SOURCES)

9
input/Makefile.am
View File

@ -1,20 +1,15 @@
if INPUTPLUGIN
plugindir = $(libdir)/bluetooth/plugins
plugin_LTLIBRARIES = input.la
noinst_LTLIBRARIES = input.la
input_la_SOURCES = main.c manager.h manager.c \
server.h server.c device.h device.c \
fakehid.c fakehid.h
LDADD = $(top_builddir)/common/libhelper.a \
@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
endif
AM_LDFLAGS = -module -avoid-version -no-undefined
AM_CFLAGS = -fvisibility=hidden \
AM_CFLAGS = -fvisibility=hidden -DBLUETOOTH_PLUGIN_BUILTIN \
@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src

2
input/manager.c
View File

@ -45,7 +45,7 @@
static int idle_timeout = 0;
static DBusConnection *connection = NULL;
GSList *adapters = NULL;
static GSList *adapters = NULL;
static void input_remove(struct btd_device *device, const char *uuid)
{

9
network/Makefile.am
View File

@ -1,20 +1,15 @@
if NETWORKPLUGIN
plugindir = $(libdir)/bluetooth/plugins
plugin_LTLIBRARIES = network.la
noinst_LTLIBRARIES = network.la
network_la_SOURCES = main.c manager.h manager.c \
server.h server.c bridge.h bridge.c \
connection.h connection.c common.h common.c
LDADD = $(top_builddir)/common/libhelper.a \
@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
endif
AM_LDFLAGS = -module -avoid-version -no-undefined
AM_CFLAGS = -fvisibility=hidden \
AM_CFLAGS = -fvisibility=hidden -DBLUETOOTH_PLUGIN_BUILTIN \
@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src

13
serial/Makefile.am
View File

@ -1,20 +1,15 @@
if SERIALPLUGIN
plugindir = $(libdir)/bluetooth/plugins
noinst_LTLIBRARIES = serial.la
plugin_LTLIBRARIES = serial.la
serial_la_SOURCES = main.c manager.h manager.c \
port.h port.c proxy.h proxy.c
serial_la_SOURCES = main.c \
manager.h manager.c port.h port.c \
proxy.h proxy.c
LDADD = $(top_builddir)/common/libhelper.a \
@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
endif
AM_LDFLAGS = -module -avoid-version -no-undefined
AM_CFLAGS = -fvisibility=hidden \
AM_CFLAGS = -fvisibility=hidden -DBLUETOOTH_PLUGIN_BUILTIN \
@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src

1
serial/manager.c
View File

@ -73,7 +73,6 @@
#define RFCOMM_UUID_STR "00000003-0000-1000-8000-00805F9B34FB"
static DBusConnection *connection = NULL;
GSList *adapters = NULL;
static int serial_probe(struct btd_device *device, const char *uuid)
{

24
src/Makefile.am
View File

@ -16,6 +16,7 @@ endif
builtin_modules =
builtin_sources =
builtin_cflags =
builtin_libadd =
if SERVICEPLUGIN
builtin_modules += service
@ -31,6 +32,26 @@ builtin_sources += $(top_srcdir)/plugins/hal.c
builtin_modules += storage
builtin_sources += $(top_srcdir)/plugins/storage.c
if NETWORKPLUGIN
builtin_modules += network
builtin_libadd += $(top_builddir)/network/network.la
endif
if SERIALPLUGIN
builtin_modules += serial
builtin_libadd += $(top_builddir)/serial/serial.la
endif
if INPUTPLUGIN
builtin_modules += input
builtin_libadd += $(top_builddir)/input/input.la
endif
if AUDIOPLUGIN
builtin_modules += audio
builtin_libadd += $(top_builddir)/audio/audio.la
endif
noinst_LTLIBRARIES = libbuiltin.la
libbuiltin_la_SOURCES = $(builtin_sources)
@ -52,7 +73,8 @@ bluetoothd_SOURCES = main.c security.c hcid.h sdpd.h \
error.h error.c manager.h manager.c adapter.h adapter.c \
device.h device.c dbus-common.c dbus-common.h dbus-hci.h dbus-hci.c
bluetoothd_LDADD = $(top_builddir)/common/libhelper.a libbuiltin.la \
bluetoothd_LDADD = $(top_builddir)/common/libhelper.a \
libbuiltin.la $(builtin_libadd) \
@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ -ldl
bluetoothd_LDFLAGS = -Wl,--export-dynamic