From 4dc25b9feffb5e9bcb38dd7ff818a0eb84fe8e82 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 11 Mar 2008 19:41:53 +0000 Subject: Add directory for plugins --- plugins/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 plugins/Makefile.am (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am new file mode 100644 index 00000000..02742923 --- /dev/null +++ b/plugins/Makefile.am @@ -0,0 +1,2 @@ + +MAINTAINERCLEANFILES = Makefile.in -- cgit From 971ed9531285f7de6b2c7a06095a833f9cbad08a Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 11 Mar 2008 20:00:16 +0000 Subject: Add skeleton for the example plugin --- plugins/Makefile.am | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 02742923..b6020d05 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,2 +1,14 @@ +plugindir = $(libdir)/bluetooth/plugins + +plugin_LTLIBRARIES = libecho.la + +libecho_la_SOURCES = echo.c + +AM_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc + +AM_CFLAGS = @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ + +INCLUDES = -I$(top_builddir)/common -I$(top_builddir)/hcid + MAINTAINERCLEANFILES = Makefile.in -- cgit From 00f67ab2dac3ffbf90c13d3da6008e0e66fca41e Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 11 Mar 2008 23:52:47 +0000 Subject: No need for linking the plugins --- plugins/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index b6020d05..0fb8a135 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -7,8 +7,6 @@ libecho_la_SOURCES = echo.c AM_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc -AM_CFLAGS = @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ - INCLUDES = -I$(top_builddir)/common -I$(top_builddir)/hcid MAINTAINERCLEANFILES = Makefile.in -- cgit From fbd60c20356e145a30e7fe7f6e91c9e8cf3c73da Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 12 Mar 2008 21:22:06 +0000 Subject: Add RFCOMM listener to echo plugin --- plugins/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 0fb8a135..4e2b76a8 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -7,6 +7,8 @@ libecho_la_SOURCES = echo.c AM_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ + INCLUDES = -I$(top_builddir)/common -I$(top_builddir)/hcid MAINTAINERCLEANFILES = Makefile.in -- cgit From 201a729d46df51732304d47b7ed6c0bbe891e7d4 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 12 Mar 2008 21:30:48 +0000 Subject: Fix include directories for successful make distcheck --- plugins/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 4e2b76a8..146a12e6 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -9,6 +9,6 @@ AM_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ -INCLUDES = -I$(top_builddir)/common -I$(top_builddir)/hcid +INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid MAINTAINERCLEANFILES = Makefile.in -- cgit From 3c63053cdd3c7fa5a681aca562c0bd833947f559 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 21 Mar 2008 23:31:40 +0000 Subject: Don't install example plugin --- plugins/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 146a12e6..b00817d9 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,7 +1,7 @@ plugindir = $(libdir)/bluetooth/plugins -plugin_LTLIBRARIES = libecho.la +noinst_LTLIBRARIES = libecho.la libecho_la_SOURCES = echo.c -- cgit From 24eaef5b7c1bdbaa1d956d7714184ab0a8059185 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 22 Mar 2008 15:49:37 +0000 Subject: Link network and input plugins for easier testing --- plugins/Makefile.am | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index b00817d9..ce0cbca6 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -12,3 +12,11 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid MAINTAINERCLEANFILES = Makefile.in + +all-local: + @$(LN_S) -f $(top_srcdir)/input/.libs/libinput.so + @$(LN_S) -f $(top_srcdir)/network/.libs/libnetwork.so + +clean-local: + @rm -f libnetwork.so + @rm -f libinput.so -- cgit From 30b429c3852bb036dc473b3ff11a278df443026d Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 22 Mar 2008 16:12:20 +0000 Subject: Create links for audio and serial plugins --- plugins/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index ce0cbca6..37ca3c01 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -15,8 +15,12 @@ MAINTAINERCLEANFILES = Makefile.in all-local: @$(LN_S) -f $(top_srcdir)/input/.libs/libinput.so + @$(LN_S) -f $(top_srcdir)/audio/.libs/libaudio.so + @$(LN_S) -f $(top_srcdir)/serial/.libs/libserial.so @$(LN_S) -f $(top_srcdir)/network/.libs/libnetwork.so clean-local: @rm -f libnetwork.so + @rm -f libserial.so + @rm -f libaudio.so @rm -f libinput.so -- cgit From f8d4886cb737aadf03e2c9bed2e729f5a8c2728d Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 5 Apr 2008 06:37:08 +0000 Subject: Add skeleton for storage plugin --- plugins/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 37ca3c01..a2a521dc 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,6 +1,10 @@ plugindir = $(libdir)/bluetooth/plugins +plugin_LTLIBRARIES = libstorage.la + +libstorage_la_SOURCES = storage.c + noinst_LTLIBRARIES = libecho.la libecho_la_SOURCES = echo.c -- cgit From e7d668ac9e813bc9922ee7d771848bd8822d5d1f Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 8 May 2008 20:23:45 +0000 Subject: Move D-Bus watch functions into libgdbus --- plugins/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index a2a521dc..c403e835 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -11,7 +11,7 @@ libecho_la_SOURCES = echo.c AM_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid -- cgit From f3c0a1a49b0b505b8543b5b3405bd62126be1a24 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 9 May 2008 09:16:32 +0000 Subject: Use -no-undefined for linking plugins --- plugins/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index c403e835..6f07b99a 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -9,7 +9,8 @@ noinst_LTLIBRARIES = libecho.la libecho_la_SOURCES = echo.c -AM_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc +AM_LDFLAGS = -module -avoid-version -no-undefined \ + -export-symbols-regex bluetooth_plugin_desc AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ -- cgit From 865f1108806df04d4bc1b81d08756924e5d52d6a Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 15 May 2008 02:39:26 +0000 Subject: Add initial work for netlink plugin --- plugins/Makefile.am | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 6f07b99a..2a3212e1 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,7 +1,13 @@ plugindir = $(libdir)/bluetooth/plugins -plugin_LTLIBRARIES = libstorage.la +if NETLINK +netlink_plugins = libnetlink.la +else +netlink_plugins = +endif + +plugin_LTLIBRARIES = libstorage.la $(netlink_plugins) libstorage_la_SOURCES = storage.c @@ -9,16 +15,24 @@ noinst_LTLIBRARIES = libecho.la libecho_la_SOURCES = echo.c +if NETLINK +libnetlink_la_SOURCES = netlink.c + +libnetlink_la_LIBADD = @NETLINK_LIBS@ +endif + AM_LDFLAGS = -module -avoid-version -no-undefined \ -export-symbols-regex bluetooth_plugin_desc -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ @NETLINK_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid MAINTAINERCLEANFILES = Makefile.in all-local: + @$(LN_S) -f $(top_srcdir)/plugins/.libs/libstorage.so + @$(LN_S) -f $(top_srcdir)/plugins/.libs/libnetlink.so @$(LN_S) -f $(top_srcdir)/input/.libs/libinput.so @$(LN_S) -f $(top_srcdir)/audio/.libs/libaudio.so @$(LN_S) -f $(top_srcdir)/serial/.libs/libserial.so @@ -29,3 +43,5 @@ clean-local: @rm -f libserial.so @rm -f libaudio.so @rm -f libinput.so + @rm -f libnetlink.so + @rm -f libstorage.so -- cgit From 407a723fbd995760217d837d6bca7d6049d1fdbf Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 18 Jun 2008 15:35:40 +0000 Subject: Make netlink support optional and disable storage plugin --- plugins/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 2a3212e1..2e23a0a7 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -7,14 +7,14 @@ else netlink_plugins = endif -plugin_LTLIBRARIES = libstorage.la $(netlink_plugins) +plugin_LTLIBRARIES = $(netlink_plugins) -libstorage_la_SOURCES = storage.c - -noinst_LTLIBRARIES = libecho.la +noinst_LTLIBRARIES = libecho.la libstorage.la libecho_la_SOURCES = echo.c +libstorage_la_SOURCES = storage.c + if NETLINK libnetlink_la_SOURCES = netlink.c -- cgit From b468daedba50975703c41e99194d223c540131aa Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 22 Jun 2008 01:51:37 +0000 Subject: Remove unneeded links --- plugins/Makefile.am | 4 ---- 1 file changed, 4 deletions(-) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 2e23a0a7..fac16104 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -31,8 +31,6 @@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid MAINTAINERCLEANFILES = Makefile.in all-local: - @$(LN_S) -f $(top_srcdir)/plugins/.libs/libstorage.so - @$(LN_S) -f $(top_srcdir)/plugins/.libs/libnetlink.so @$(LN_S) -f $(top_srcdir)/input/.libs/libinput.so @$(LN_S) -f $(top_srcdir)/audio/.libs/libaudio.so @$(LN_S) -f $(top_srcdir)/serial/.libs/libserial.so @@ -43,5 +41,3 @@ clean-local: @rm -f libserial.so @rm -f libaudio.so @rm -f libinput.so - @rm -f libnetlink.so - @rm -f libstorage.so -- cgit From a22a088109b664efdee397affed55b039cb0999b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 30 Jun 2008 05:47:13 +0000 Subject: Don't use lib prefix for plugins --- plugins/Makefile.am | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index fac16104..a8e833d0 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -2,23 +2,23 @@ plugindir = $(libdir)/bluetooth/plugins if NETLINK -netlink_plugins = libnetlink.la +netlink_plugins = netlink.la else netlink_plugins = endif plugin_LTLIBRARIES = $(netlink_plugins) -noinst_LTLIBRARIES = libecho.la libstorage.la +noinst_LTLIBRARIES = echo.la storage.la -libecho_la_SOURCES = echo.c +echo_la_SOURCES = echo.c -libstorage_la_SOURCES = storage.c +storage_la_SOURCES = storage.c if NETLINK -libnetlink_la_SOURCES = netlink.c +netlink_la_SOURCES = netlink.c -libnetlink_la_LIBADD = @NETLINK_LIBS@ +netlink_la_LIBADD = @NETLINK_LIBS@ endif AM_LDFLAGS = -module -avoid-version -no-undefined \ @@ -31,13 +31,13 @@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid MAINTAINERCLEANFILES = Makefile.in all-local: - @$(LN_S) -f $(top_srcdir)/input/.libs/libinput.so - @$(LN_S) -f $(top_srcdir)/audio/.libs/libaudio.so - @$(LN_S) -f $(top_srcdir)/serial/.libs/libserial.so - @$(LN_S) -f $(top_srcdir)/network/.libs/libnetwork.so + @$(LN_S) -f $(top_srcdir)/input/.libs/input.so + @$(LN_S) -f $(top_srcdir)/audio/.libs/audio.so + @$(LN_S) -f $(top_srcdir)/serial/.libs/serial.so + @$(LN_S) -f $(top_srcdir)/network/.libs/network.so clean-local: - @rm -f libnetwork.so - @rm -f libserial.so - @rm -f libaudio.so - @rm -f libinput.so + @rm -f network.so + @rm -f serial.so + @rm -f audio.so + @rm -f input.so -- cgit