CVS: main Makefile, 1.303, 1.304 configure, 1.916, 1.917
CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv22634 Modified Files: Makefile configure Log Message: fixing --disable for mp3lib, liba52 and libmpeg2 Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- Makefile 26 Sep 2004 14:40:59 -0000 1.303 +++ Makefile 7 Oct 2004 09:31:15 -0000 1.304 @@ -33,7 +33,7 @@ VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(CACA_LIB) AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB) -COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB) +COMMON_LIBS = libmpcodecs/libmpcodecs.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB) CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall ifeq ($(TOOLAME),yes) @@ -41,7 +41,16 @@ CODEC_LIBS += $(TOOLAME_LIB) endif -PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libavformat libao2 drivers osdep postproc input libvo libaf +PARTS = libmpdemux libmpcodecs libavcodec libavformat libao2 drivers osdep postproc input libvo libaf +ifeq ($(MP3LIB),yes) +PARTS += mp3lib +endif +ifeq ($(LIBA52),yes) +PARTS += liba52 +endif +ifeq ($(LIBMPEG2),yes) +PARTS += libmpeg2 +endif ifeq ($(INTERNAL_FAAD),yes) COMMON_LIBS += libfaad2/libfaad2.a PARTS += libfaad2 @@ -74,8 +83,20 @@ ALL_PRG += $(PRG_MENCODER) endif -COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a +COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a +ifeq ($(MP3LIB),yes) +COMMON_DEPS += mp3lib/libMP3.a +COMMON_LIBS += mp3lib/libMP3.a +endif +ifeq ($(LIBA52),yes) +COMMON_DEPS += liba52/liba52.a +COMMON_LIBS += liba52/liba52.a +endif +ifeq ($(LIBMPEG2),yes) +COMMON_DEPS += libmpeg2/libmpeg2.a +COMMON_LIBS += libmpeg2/libmpeg2.a +endif ifeq ($(INTERNAL_FAAD),yes) COMMON_DEPS += libfaad2/libfaad2.a endif Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.916 retrieving revision 1.917 diff -u -r1.916 -r1.917 --- configure 26 Sep 2004 14:49:33 -0000 1.916 +++ configure 7 Oct 2004 09:31:15 -0000 1.917 @@ -4989,7 +4989,7 @@ _def_liba52='#define USE_LIBA52 1' _codecmodules="liba52 $_codecmodules" else - _def_liba52'#undef USE_LIBA52' + _def_liba52='#undef USE_LIBA52' _nocodecmodules="liba52 $_nocodecmodules" fi echores "$_liba52" @@ -5019,7 +5019,7 @@ _def_libmpeg2='#define USE_LIBMPEG2 1' _codecmodules="libmpeg2 $_codecmodules" else - _def_libmpeg2'#undef USE_LIBMPEG2' + _def_libmpeg2='#undef USE_LIBMPEG2' _nocodecmodules="libmpeg2 $_nocodecmodules" fi echores "$_libmpeg2" @@ -6294,6 +6294,10 @@ OPENDIVX = $_opendivx +MP3LIB = $_mp3lib +LIBA52 = $_liba52 +LIBMPEG2 = $_libmpeg2 + UNRARLIB = $_unrarlib HAVE_FFPOSTPROCESS = $_def_haveffpostprocess PNG = $_mkf_png
participants (1)
-
syncmail@mplayerhq.hu