summaryrefslogtreecommitdiffstats
path: root/audio/Makefile.am
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-01-20 05:26:15 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-01-20 05:26:15 +0000
commit8cc5595d9091b484b9a4abe314c0f3ec055e0581 (patch)
tree0d20c6f621673dbdb6095fb4854077152c1d9b40 /audio/Makefile.am
parent884cfe825db1a0e8c98aa6a604fd4588a1de1340 (diff)
Make it possible to support an embedded GLib
Diffstat (limited to 'audio/Makefile.am')
-rw-r--r--audio/Makefile.am14
1 files changed, 3 insertions, 11 deletions
diff --git a/audio/Makefile.am b/audio/Makefile.am
index 60a546e7..f7e48a3f 100644
--- a/audio/Makefile.am
+++ b/audio/Makefile.am
@@ -1,14 +1,6 @@
servicedir = $(libdir)/bluetooth
-if GLIB
-glib_cflags = @GLIB_CFLAGS@
-glib_ldadd = @GLIB_LIBS@
-else
-glib_cflags =
-glib_ldadd =
-endif
-
noinst_PROGRAMS = bluetoothd-service-audio \
bluetoothd-service-headset
@@ -16,10 +8,10 @@ bluetoothd_service_audio_SOURCES = main.c
bluetoothd_service_headset_SOURCES = headset.c
-LDADD = $(top_builddir)/common/libhelper.a $(glib_ldadd) \
- @DBUS_LIBS@ @BLUEZ_LIBS@
+LDADD = $(top_builddir)/common/libhelper.a \
+ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ $(glib_cflags)
+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
INCLUDES = -I$(top_srcdir)/common