summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-03-28 20:44:39 +0000
committerMarcel Holtmann <marcel@holtmann.org>2008-03-28 20:44:39 +0000
commite50eaea0cca7cb5b95a67b5ea9eee512b2b5485e (patch)
tree8d5bfee17a9897f614b2d3b750deebb77cefdaf2 /audio
parenteb897867c1cc4802c168d3ca11a0e26b897bcb01 (diff)
Update the fix for the 64-bit build issue
Diffstat (limited to 'audio')
-rw-r--r--audio/Makefile.am9
1 files changed, 5 insertions, 4 deletions
diff --git a/audio/Makefile.am b/audio/Makefile.am
index 52dcd0ae..37d7a98f 100644
--- a/audio/Makefile.am
+++ b/audio/Makefile.am
@@ -11,12 +11,9 @@ libaudio_la_SOURCES = main.c \
sink.c sink.h avdtp.c avdtp.h \
a2dp.c a2dp.h control.c control.h
-libaudio_la_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc
-# libaudio_la_LIBADD = $(top_builddir)/common/libhelper.a \
-# @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
LDADD = $(top_builddir)/common/libhelper.a \
@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
-libaudio_la_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
+
if ALSA
alsadir = $(libdir)/alsa-lib
@@ -53,6 +50,10 @@ libgstbluetooth_la_CFLAGS = @GSTREAMER_CFLAGS@ @SBC_CFLAGS@
endif
endif
+AM_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc
+
+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
+
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid -I$(top_srcdir)/sdpd
EXTRA_DIST = audio.conf audio-api.txt test-audio asound.conf