[Mplayer-cvslog] CVS: main Makefile,1.97,1.98 configure,1.232,1.233

[pl]

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

Modified Files:
	Makefile configure 
Log Message:
mplayer does not need -ldivxencore
mencoder does


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- Makefile	6 Nov 2001 23:14:35 -0000	1.97
+++ Makefile	11 Nov 2001 01:45:01 -0000	1.98
@@ -129,7 +129,7 @@
 	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
 
 $(PRG_MENCODER): $(MENCODER_DEP)
-	$(CC) -rdynamic $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux $(X_LIBS) $(XMM_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm
+	$(CC) -rdynamic $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux $(X_LIBS) $(XMM_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(ENCORE_LIBS) $(TERMCAP_LIB) -lm
 
 # $(PRG_HQ):	depfile mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
 # 	$(CC) $(CFLAGS) -o $(PRG_HQ) mplayerHQ.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- configure	10 Nov 2001 15:01:47 -0000	1.232
+++ configure	11 Nov 2001 01:45:01 -0000	1.233
@@ -2467,7 +2467,8 @@
 
 if test "$_divx4linux" = yes ; then
  _divx4def='#define NEW_DECORE'
- _decorelibs='-ldivxdecore -ldivxencore opendivx/postprocess.o'
+ _decorelibs='-ldivxdecore opendivx/postprocess.o'
+ _encorelibs='-ldivxencore'
 else
  _divx4def='#undef NEW_DECORE'
  _decorelibs='-Lopendivx -ldecore'
@@ -2523,6 +2524,7 @@
 ARCH_LIBS = $_archlibs $_iconvlib
 STREAMING=$_streaming
 DECORE_LIBS = $_decorelibs
+ENCORE_LIBS = $_encorelibs
 DIVX4LINUX=$_divx4linux
 MLIB_INC = $_mlibinc
 MLIB_LIB = $_mliblib