summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-07-29 22:22:42 +0200
committerMarcel Holtmann <marcel@holtmann.org>2008-07-29 22:22:42 +0200
commit7748a8161c4233f7a8db57dd816cbec57478a709 (patch)
tree3ca5e3ba7558b1a6727713fb64d38133c8ddbf1c
parent081d9d1df3cde11e3e3833201f4cadac6f355da0 (diff)
Fix internal includes for Bluetooth library
-rw-r--r--audio/Makefile.am12
-rw-r--r--common/Makefile.am2
2 files changed, 7 insertions, 7 deletions
diff --git a/audio/Makefile.am b/audio/Makefile.am
index bd54e9cb..d9f12f87 100644
--- a/audio/Makefile.am
+++ b/audio/Makefile.am
@@ -24,13 +24,13 @@ alsa_LTLIBRARIES = libasound_module_pcm_bluetooth.la libasound_module_ctl_blueto
libasound_module_pcm_bluetooth_la_SOURCES = pcm_bluetooth.c rtp.h ipc.h ipc.c
libasound_module_pcm_bluetooth_la_LDFLAGS = -module -avoid-version -export-symbols-regex [_]*snd_pcm_.*
-libasound_module_pcm_bluetooth_la_LIBADD = @SBC_LIBS@ @ALSA_LIBS@
-libasound_module_pcm_bluetooth_la_CFLAGS = @ALSA_CFLAGS@ @SBC_CFLAGS@
+libasound_module_pcm_bluetooth_la_LIBADD = @SBC_LIBS@ @BLUEZ_LIBS@ @ALSA_LIBS@
+libasound_module_pcm_bluetooth_la_CFLAGS = @ALSA_CFLAGS@ @BLUEZ_CFLAGS@ @SBC_CFLAGS@
libasound_module_ctl_bluetooth_la_SOURCES = ctl_bluetooth.c rtp.h ipc.h ipc.c
libasound_module_ctl_bluetooth_la_LDFLAGS = -module -avoid-version -export-symbols-regex [_]*snd_ctl_.*
-libasound_module_ctl_bluetooth_la_LIBADD = @ALSA_LIBS@
-libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@
+libasound_module_ctl_bluetooth_la_LIBADD = @BLUEZ_LIBS@ @ALSA_LIBS@
+libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@ @BLUEZ_CFLAGS@
endif
if GSTREAMER
@@ -48,8 +48,8 @@ libgstbluetooth_la_SOURCES = gstbluetooth.c \
gstrtpsbcpay.h gstrtpsbcpay.c \
rtp.h ipc.h ipc.c
libgstbluetooth_la_LDFLAGS = -module -avoid-version -export-symbols-regex gst_plugin_desc
-libgstbluetooth_la_LIBADD = @SBC_LIBS@ @GSTREAMER_LIBS@ -lgstaudio-0.10 -lgstrtp-0.10
-libgstbluetooth_la_CFLAGS = @GSTREAMER_CFLAGS@ @SBC_CFLAGS@
+libgstbluetooth_la_LIBADD = @SBC_LIBS@ @BLUEZ_LIBS@ @GSTREAMER_LIBS@ -lgstaudio-0.10 -lgstrtp-0.10
+libgstbluetooth_la_CFLAGS = @GSTREAMER_CFLAGS@ @BLUEZ_CFLAGS@ @SBC_CFLAGS@
endif
endif
diff --git a/common/Makefile.am b/common/Makefile.am
index 6ae5ed7a..3a5add7c 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -9,7 +9,7 @@ noinst_PROGRAMS = test_textfile
test_textfile_LDADD = libhelper.a
-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
EXTRA_DIST = ppoll.h uinput.h