diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-12 00:37:42 +0000 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-12 00:37:42 +0000 |
commit | c97480f11bdfdc3cbb867b8127074bcb6b047024 (patch) | |
tree | 885dff3c4d9f46567af438af0e266acdc932f281 /hcid/Makefile.am | |
parent | b6f6c5cf2f85f27b277b891acf0a22c4a068bbbe (diff) |
Allow compilation against GLib
Diffstat (limited to 'hcid/Makefile.am')
-rw-r--r-- | hcid/Makefile.am | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/hcid/Makefile.am b/hcid/Makefile.am index afab067f..167c9bdf 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -13,6 +13,14 @@ dbusdir = $(sysconfdir)/dbus-1/system.d dbus_DATA = bluetooth.conf endif +if GLIB +glib_cflags = @GLIB_CFLAGS@ +glib_ldadd = @GLIB_LIBS@ +else +glib_cflags = +glib_ldadd = +endif + noinst_LIBRARIES = libhciserver.a libhciserver_a_SOURCES = hcid.h security.c device.c storage.c \ @@ -30,7 +38,7 @@ noinst_PROGRAMS = passkey-agent service-agent auth-agent hcid_SOURCES = main.c -hcid_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ \ +hcid_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ \ libhciserver.a $(top_builddir)/common/libhelper.a if EXPAT @@ -49,7 +57,7 @@ auth_agent_SOURCES = auth-agent.c auth_agent_LDADD = @DBUS_LIBS@ -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ $(glib_cflags) INCLUDES = -I$(top_srcdir)/common |