# HG changeset patch # User diego # Date 1156197107 0 # Node ID fa86e7d57d1bef4a2219b59bec333075475b0cef # Parent a917f318c1b711ac2dbbf8081aef65cc7b201fb5 Move libs common to MPlayer and MEncoder to COMMON_LIBS. diff -r a917f318c1b7 -r fa86e7d57d1b Makefile --- 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)