diff options
| -rw-r--r-- | acinclude.m4 | 3 | ||||
| -rw-r--r-- | gdbus/Makefile.am | 6 | ||||
| -rw-r--r-- | gdbus/gdbus.h | 22 | ||||
| -rw-r--r-- | gdbus/mainloop.c | 40 | ||||
| -rw-r--r-- | hcid/Makefile.am | 5 |
5 files changed, 74 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1721e0e6..07572bb7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -329,6 +329,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(GLIB, false) fi + AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus']) + AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la']) + AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc']) AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) diff --git a/gdbus/Makefile.am b/gdbus/Makefile.am index 02742923..0a481277 100644 --- a/gdbus/Makefile.am +++ b/gdbus/Makefile.am @@ -1,2 +1,8 @@ +noinst_LTLIBRARIES = libgdbus.la + +libgdbus_la_SOURCES = gdbus.h mainloop.c + +AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ + MAINTAINERCLEANFILES = Makefile.in diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h new file mode 100644 index 00000000..71377516 --- /dev/null +++ b/gdbus/gdbus.h @@ -0,0 +1,22 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2004-2008 Marcel Holtmann <marcel@holtmann.org> + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/gdbus/mainloop.c b/gdbus/mainloop.c new file mode 100644 index 00000000..f08299f0 --- /dev/null +++ b/gdbus/mainloop.c @@ -0,0 +1,40 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2004-2008 Marcel Holtmann <marcel@holtmann.org> + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <glib.h> + +#include <dbus/dbus.h> + +#ifdef NEED_DBUS_WATCH_GET_UNIX_FD +#define dbus_watch_get_unix_fd dbus_watch_get_fd +#endif + +#ifdef HAVE_DBUS_GLIB +#include <dbus/dbus-glib-lowlevel.h> +#endif + +#include "gdbus.h" diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 6dcecc6f..cf586ed2 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -28,7 +28,7 @@ hcid_SOURCES = main.c hcid_LDADD = libhciserver.a \ $(top_builddir)/sdpd/libsdpserver.a \ $(top_builddir)/common/libhelper.a \ - @GMODULE_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ + @GDBUS_LIBS@ @GMODULE_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ if MAINTAINER_MODE plugindir = $(abs_top_srcdir)/plugins @@ -36,7 +36,8 @@ else plugindir = $(libdir)/bluetooth/plugins endif -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GMODULE_CFLAGS@ \ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ \ + @GLIB_CFLAGS@ @GMODULE_CFLAGS@ @GDBUS_CFLAGS@ \ -DPLUGINDIR=\""$(plugindir)"\" INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/sdpd |