[Mplayer-cvslog] CVS: main Makefile,1.250,1.251 configure,1.661,1.662

[Michael Niedermayer CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv28693

Modified Files:
	Makefile configure 
Log Message:
moving postprocess code to libavcodec


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- Makefile	9 Feb 2003 20:18:11 -0000	1.250
+++ Makefile	14 Feb 2003 21:45:29 -0000	1.251
@@ -36,7 +36,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) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_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 $(PP_LIB) postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_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 $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall
 
@@ -81,11 +81,6 @@
 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
-ifeq (($SHARED_PP),yes)
-COMMON_DEPS += postproc/libpostproc.so
-else
-COMMON_DEPS += postproc/libpostproc.a
-endif
 
 ifeq ($(VIDIX),yes)
 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
@@ -176,12 +171,6 @@
 postproc/libswscale.a:
 	$(MAKE) -C postproc
 
-postproc/libpostproc.a:
-	$(MAKE) -C postproc
-
-postproc/libpostproc.so:
-	$(MAKE) -C postproc
-
 input/libinput.a:
 	$(MAKE) -C input
 
@@ -250,9 +239,6 @@
 install: $(ALL_PRG)
 ifeq ($(VIDIX),yes)
 	$(DO_MAKE)
-endif
-ifeq ($(SHARED_PP),yes)
-	$(MAKE) install -C postproc 
 endif
 	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
 	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.661
retrieving revision 1.662
diff -u -r1.661 -r1.662
--- configure	13 Feb 2003 19:13:50 -0000	1.661
+++ configure	14 Feb 2003 21:45:29 -0000	1.662
@@ -4494,11 +4494,6 @@
 echores "$_byte_order"
 
 echocheck "shared postprocess lib"
-if test "$_shared_pp" = yes ; then
-  _ld_pp='-Lpostproc -lpostproc'
-else
-  _ld_pp='postproc/libpostproc.a'
-fi
 echores "$_shared_pp"
 
 echocheck "New config"
@@ -4836,8 +4831,8 @@
 STREAMING_LIVE_DOT_COM = $_live
 STREAMING_LIB = $_ld_streaming $_ld_live
 VIDIX = $_vidix
-PP_LIB = $_ld_pp
 SHARED_PP = $_shared_pp
+CONFIG_PP = yes
 CONFIG_RISKY = yes
 LIBMENU = $_menu
 I18NLIBS = $_i18n_libs