[MPlayer-cvslog] r19489 - trunk/Makefile

[diego]

Author: diego
Date: Mon Aug 21 23:51:47 2006
New Revision: 19489

Modified:
   trunk/Makefile

Log:
Move libs common to MPlayer and MEncoder to COMMON_LIBS.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Aug 21 23:51:47 2006
@@ -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)