Mercurial > mplayer.hg
changeset 5841:9cc33be028bb
corrected what felix made buggy ;-)
| author | jaf |
|---|---|
| date | Fri, 26 Apr 2002 19:11:13 +0000 |
| parents | 4e3cf9473628 |
| children | d6eab895c742 |
| files | Makefile configure |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri Apr 26 17:18:02 2002 +0000 +++ b/Makefile Fri Apr 26 19:11:13 2002 +0000 @@ -91,7 +91,7 @@ .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 @@ 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 @@ $(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)
--- a/configure Fri Apr 26 17:18:02 2002 +0000 +++ b/configure Fri Apr 26 19:11:13 2002 +0000 @@ -3046,7 +3046,6 @@ 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_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