diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-08-09 14:35:39 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-08-09 14:35:39 -0700 |
| commit | f5f61c23d7be30efee729d4ec12900cfa2a25ffa (patch) | |
| tree | 632da7c448071a4eddcbc7e4620815ac5e2f43b0 /serial | |
| parent | 33f51f71f9ce9af5ba3bf2fdce3310645e24f2f2 (diff) | |
| download | bluez-f5f61c23d7be30efee729d4ec12900cfa2a25ffa.tar.gz | |
Make all major plugins builtin to simplify debugging
Diffstat (limited to 'serial')
| -rw-r--r-- | serial/Makefile.am | 13 | ||||
| -rw-r--r-- | serial/manager.c | 1 |
2 files changed, 4 insertions, 10 deletions
diff --git a/serial/Makefile.am b/serial/Makefile.am index f8f26e255..04c498498 100644 --- a/serial/Makefile.am +++ b/serial/Makefile.am @@ -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 diff --git a/serial/manager.c b/serial/manager.c index 71f1a5e1b..2022fcb9a 100644 --- a/serial/manager.c +++ b/serial/manager.c @@ -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) { |