summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-01-12 00:49:27 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-01-12 00:49:27 +0000
commit0d68e70bb86132a935e1521f3bf430f404f91afe (patch)
tree839f3c48639e774a4d9bf40c81182d2eb4fadce7 /test
parentc97480f11bdfdc3cbb867b8127074bcb6b047024 (diff)
Allow compilation against GLib
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am12
1 files changed, 10 insertions, 2 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 7b1f0713..93ad39b9 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,12 @@
+if GLIB
+glib_cflags = @GLIB_CFLAGS@
+glib_ldadd = @GLIB_LIBS@
+else
+glib_cflags =
+glib_ldadd =
+endif
+
if TEST
sbin_PROGRAMS = hciemu
@@ -6,7 +14,7 @@ bin_PROGRAMS = l2test rctest
noinst_PROGRAMS = sdptest scotest attest hstest bdaddr sttest
-hciemu_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
+hciemu_LDADD = $(glib_ldadd) @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
l2test_LDADD = @BLUEZ_LIBS@
@@ -28,7 +36,7 @@ sttest_LDADD = @BLUEZ_LIBS@
noinst_MANS = bdaddr.8
-AM_CFLAGS = @BLUEZ_CFLAGS@
+AM_CFLAGS = @BLUEZ_CFLAGS@ $(glib_cflags)
endif
INCLUDES = -I$(top_srcdir)/common