Mercurial > mplayer.hg

changeset 19483:fa86e7d57d1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move libs common to MPlayer and MEncoder to COMMON_LIBS.
author diego
date Mon, 21 Aug 2006 21:51:47 +0000
parents a917f318c1b7
children 6eb79b2384f8
files Makefile
diffstat 1 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Aug 21 21:50:52 2006 +0000
+++ b/Makefile	Mon Aug 21 21:51:47 2006 +0000
@@ -111,6 +111,7 @@
               stream/stream.a \
               libswscale/libswscale.a \
               osdep/libosdep.a \
+              $(EXTRA_LIB)\
               $(DVDREAD_LIB) \
               $(DVDNAV_LIB) \
               $(CODEC_LIBS) \
@@ -124,6 +125,11 @@
               $(SMBSUPPORT_LIB) \
               $(FRIBIDI_LIB) \
               $(ENCA_LIB) \
+              $(LIRC_LIB) \
+              $(LIRCC_LIB) \
+              $(ARCH_LIB) \
+              $(MATH_LIB) \
+              $(LIBC_LIB) \
 
 CFLAGS = $(OPTFLAGS) -I. $(LIBAV_INC)
 
@@ -370,13 +376,7 @@
                $(COMMON_LIBS) \
                $(VO_LIBS) \
                $(AO_LIBS) \
-               $(EXTRA_LIB)\
-               $(LIRC_LIB) \
-               $(LIRCC_LIB) \
                $(STATIC_LIB) \
-               $(ARCH_LIB) \
-               $(MATH_LIB) \
-               $(LIBC_LIB) \
 
 $(PRG):	$(MPLAYER_DEP)
     ifeq ($(TARGET_WIN32),yes)
@@ -388,13 +388,7 @@
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
                 $(ENCORE_LIB) \
                 $(COMMON_LIBS) \
-                $(EXTRA_LIB) \
                 $(MLIB_LIB) \
-                $(LIRC_LIB) \
-                $(LIRCC_LIB) \
-                $(ARCH_LIB) \
-                $(MATH_LIB) \
-                $(LIBC_LIB) \
 
 $(PRG_MENCODER): $(MENCODER_DEP)
 	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER)