[Mplayer-cvslog] CVS: main Makefile,1.282,1.283

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv2402

Modified Files:
	Makefile 
Log Message:
Removed mpflac as ffflac is way better and ad_flac won't compile with external flac

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- Makefile	10 Dec 2003 12:03:54 -0000	1.282
+++ Makefile	5 Apr 2004 22:49:28 -0000	1.283
@@ -35,7 +35,7 @@
 VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) 
 AO_LIBS = $(ARTS_LIB) $(ESD_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) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_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) $(FLAC_LIB) $(FONTCONFIG_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)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) # -Wall
 
@@ -66,9 +66,6 @@
 ifeq ($(LIBMENU),yes)
 PARTS += libmenu
 endif
-ifneq ($(MPFLAC),none)
-PARTS += libmpflac
-endif
 
 ALL_PRG = $(PRG)
 ifeq ($(MENCODER),yes)
@@ -104,10 +101,6 @@
 GUI_LIBS = Gui/libgui.a
 endif
 
-ifneq ($(MPFLAC),none)
-COMMON_DEPS += libmpflac/libmpflac.a
-endif
-
 .SUFFIXES: .cc .c .o
 
 # .PHONY: $(COMMON_DEPS)
@@ -189,9 +182,6 @@
 libavcodec/libpostproc/libpostproc.so:
 	$(MAKE) -C libavcodec/libpostproc
 
-libmpflac/libmpflac.a:
-	$(MAKE) -C libmpflac
-
 MPLAYER_DEP = $(OBJS_MPLAYER) $(COMMON_DEPS)
 
 ifeq ($(LIBMENU),yes)