From f0996fb64cd26f96f203c5d5e39bb0a2d691d155 Mon Sep 17 00:00:00 2001
From: rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 8 Oct 2006 14:10:43 +0000
Subject: Disable linking mplayer with mp3lame when --disable-encoder=mp3lame
 is passed to configure.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20114 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 177e381cea..98c8c6aad6 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,6 @@ CODEC_LIBS = $(AV_LIB) \
              $(THEORA_LIB) \
              $(FAAD_LIB) \
              $(LIBLZO_LIB) \
-             $(DECORE_LIB) \
              $(XVID_LIB) \
              $(DTS_LIB) \
              $(PNG_LIB) \
@@ -112,6 +111,10 @@ CODEC_LIBS = $(AV_LIB) \
              $(SPEEX_LIB) \
              $(NUT_LIB) \
 
+ifeq ($(LAVC_MP3LAME),yes)
+CODEC_LIBS += $(MP3LAME_LIB)
+endif
+
 ifeq ($(TOOLAME),yes)
 CODEC_LIBS += $(TOOLAME_LIB)
 endif
@@ -388,7 +391,7 @@ $(PRG):	$(MPLAYER_DEP)
 
 ifeq ($(MENCODER),yes)
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
-                $(ENCORE_LIB) \
+                $(MP3LAME_LIB) \
                 $(COMMON_LIBS) \
 
 $(PRG_MENCODER): $(MENCODER_DEP)
-- 
cgit v1.2.3