From c97480f11bdfdc3cbb867b8127074bcb6b047024 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 12 Jan 2007 00:37:42 +0000 Subject: Allow compilation against GLib --- input/Makefile.am | 12 ++++++++++-- input/main.c | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'input') diff --git a/input/Makefile.am b/input/Makefile.am index b578645c..cafc03a6 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -5,13 +5,21 @@ dbusdir = $(sysconfdir)/dbus-1/system.d dbus_DATA = bluetooth-input.conf endif +if GLIB +glib_cflags = @GLIB_CFLAGS@ +glib_ldadd = @GLIB_LIBS@ +else +glib_cflags = +glib_ldadd = +endif + noinst_PROGRAMS = bt.inputd bt_inputd_SOURCES = main.c input-service.h input-service.c -bt_inputd_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a +bt_inputd_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ $(glib_cflags) INCLUDES = -I$(top_srcdir)/common diff --git a/input/main.c b/input/main.c index df3b5160..5523b67f 100644 --- a/input/main.c +++ b/input/main.c @@ -26,11 +26,14 @@ #endif #include +#include #include +#include #include #include #include #include + #include #include "dbus.h" -- cgit