corrected what felix made buggy ;-)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5842 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 7 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 495a543258..11e1893e1e 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ all:	$(ALL_PRG)
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-COMMON_DEPS = $(FAME_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a
+COMMON_DEPS = libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a
 
 ifeq ($(VIDIX),yes)
 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
@@ -101,6 +101,9 @@ COMMON_DEPS += libvo2/libvo2.a
 else
 COMMON_DEPS += libvo/libvo.a
 endif
+ifeq ($(FAME),yes)
+COMMON_DEPS += libfame/libfame.a
+endif
 ifeq ($(DVDKIT),yes)
 ifeq ($(DVDKIT_SHARED),yes)
 COMMON_DEPS += libmpdvdkit/libmpdvdkit.so
@@ -211,6 +214,9 @@ $(MENCODER_DEP): version.h
 $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
 	$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
 
+jaf: 
+	echo $(COMMON_DEPS)
+
 install: $(ALL_PRG)
 ifeq ($(VIDIX),yes)
 	$(DO_MAKE)
diff --git a/configure b/configure
index 9d975a9720..3b4cf8232d 100755
--- a/configure
+++ b/configure
@@ -3046,7 +3046,6 @@ _def_fame='#undef USE_LIBFAME'
 if test "$_fame" = yes ; then
   _def_fame='#define USE_LIBFAME 1'	
   _ld_fame='-Llibfame -lfame'	
-  _dep_fame='libfame/libfame.a'
 fi  
 
 echocheck "libdv-0.9.5 (for mencoder)"
@@ -3611,7 +3610,6 @@ AV_DEP = $_dep_libavcodec
 AV_LIB = $_ld_libavcodec
 FAME = $_fame
 FAME_LIB = $_ld_fame
-FAME_DEB = $_dep_fame
 MP1E_DEP = $_dep_mp1e
 MP1E_LIB = $_ld_mp1e
 ARCH_LIB =  $_ld_arch $_ld_iconv