diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 05:26:15 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 05:26:15 +0000 |
| commit | 8cc5595d9091b484b9a4abe314c0f3ec055e0581 (patch) | |
| tree | 0d20c6f621673dbdb6095fb4854077152c1d9b40 /daemon | |
| parent | 884cfe825db1a0e8c98aa6a604fd4588a1de1340 (diff) | |
Make it possible to support an embedded GLib
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/Makefile.am | 19 | ||||
| -rw-r--r-- | daemon/database.c | 3 | ||||
| -rw-r--r-- | daemon/echo.c | 3 | ||||
| -rw-r--r-- | daemon/main.c | 3 |
4 files changed, 12 insertions, 16 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 336f2a25..73f11f3d 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -7,14 +7,6 @@ endif servicedir = $(libdir)/bluetooth -if GLIB -glib_cflags = @GLIB_CFLAGS@ -glib_ldadd = @GLIB_LIBS@ -else -glib_cflags = -glib_ldadd = -endif - noinst_PROGRAMS = bluetoothd service_PROGRAMS = bluetoothd-service-echo @@ -23,21 +15,22 @@ bluetoothd_SOURCES = main.c system.h \ manager.h manager.c database.h database.c \ adapter.h adapter.c service.h service.c -bluetoothd_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ \ - $(top_builddir)/sdpd/libsdpserver.a \ - $(top_builddir)/common/libhelper.a +bluetoothd_LDADD = \ + $(top_builddir)/common/libhelper.a \ + $(top_builddir)/sdpd/libsdpserver.a \ + @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ bluetoothd_service_echo_SOURCES = echo.c bluetoothd_service_echo_LDADD = \ $(top_builddir)/common/libhelper.a \ - $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ + @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ if EXPAT bluetoothd_LDADD += -lexpat endif -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ $(glib_cflags) +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/sdpd diff --git a/daemon/database.c b/daemon/database.c index 798a8686..231000c0 100644 --- a/daemon/database.c +++ b/daemon/database.c @@ -32,11 +32,12 @@ #include <bluetooth/sdp.h> #include <bluetooth/sdp_lib.h> +#include <glib.h> + #include <dbus/dbus.h> #include "dbus-helper.h" #include "dbus.h" -#include "glib-ectomy.h" #include "sdp-xml.h" #include "logging.h" diff --git a/daemon/echo.c b/daemon/echo.c index c79b2047..736b3a0b 100644 --- a/daemon/echo.c +++ b/daemon/echo.c @@ -36,10 +36,11 @@ #include <bluetooth/sdp.h> #include <bluetooth/sdp_lib.h> +#include <glib.h> + #include <dbus/dbus.h> #include "dbus.h" -#include "glib-ectomy.h" #include "logging.h" static GMainLoop *main_loop = NULL; diff --git a/daemon/main.c b/daemon/main.c index 56cc7782..1653ba75 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -33,11 +33,12 @@ #include <getopt.h> #include <sys/stat.h> +#include <glib.h> + #include <dbus/dbus.h> #include "dbus-helper.h" -#include "glib-ectomy.h" #include "dbus.h" #include "notify.h" #include "logging.h" |