From e50eaea0cca7cb5b95a67b5ea9eee512b2b5485e Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 28 Mar 2008 20:44:39 +0000 Subject: Update the fix for the 64-bit build issue --- audio/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'audio') 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 -- cgit