From 64819779cf2bf77c2323a89d61bdfeccb35a43ce Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 13 Sep 2013 05:52:57 +0000 Subject: [PATCH] build: ldflags conversion: libmad. Usual conversion from per-executable variables in configure.ac to per-library autoconf output variable + per-target LDFLAGS setting. --- Makefile.in | 2 ++ configure.ac | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5a255a77..80a8966c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,6 +28,7 @@ vorbis_ldflags := @vorbis_ldflags@ speex_ldflags := @speex_ldflags@ opus_ldflags := @opus_ldflags@ faad_ldflags := @faad_ldflags@ +mad_ldflags := @mad_ldflags@ build_date := $(shell date) uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS") @@ -262,6 +263,7 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),) endif para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags) +para_audiod para_filter para_play: LDFLAGS += $(mad_ldflags) para_server \ para_filter \ diff --git a/configure.ac b/configure.ac index 50beb2e9..c39b0512 100644 --- a/configure.ac +++ b/configure.ac @@ -754,18 +754,17 @@ AC_CHECK_LIB([mad], [mad_stream_init], [], [ ]) if test "$have_mad" = "yes"; then AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter) + AC_SUBST(mad_cppflags) + mad_ldflags="$mad_libs -lmad" + AC_SUBST(mad_ldflags) filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter" audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter" play_cmdline_objs="$play_cmdline_objs mp3dec_filter" filter_errlist_objs="$filter_errlist_objs mp3dec_filter" audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter" play_errlist_objs="$play_errlist_objs mp3dec_filter" - filter_ldflags="$filter_ldflags $mad_libs -lmad" - audiod_ldflags="$audiod_ldflags $mad_libs -lmad" - play_ldflags="$play_ldflags $mad_libs -lmad" audiod_audio_formats="$audiod_audio_formats mp3" filters="$filters mp3dec" - AC_SUBST(mad_cppflags) else AC_MSG_WARN([no mp3dec support in para_audiod/para_filter]) fi -- 2.39.2