summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-21 21:51:47 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-21 21:51:47 +0000
commit470943ebb786b97b01754691ffab8a0ad5451688 (patch)
tree543d566e913e6e82f5c3449d3f61e14d29f57c92 /Makefile
parent539cb1eb346ce6a607b20e55da2daec2a334ec79 (diff)
downloadmpv-470943ebb786b97b01754691ffab8a0ad5451688.tar.bz2
mpv-470943ebb786b97b01754691ffab8a0ad5451688.tar.xz
Move libs common to MPlayer and MEncoder to COMMON_LIBS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19489 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 6 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 0caa5279cd..0eca30d62d 100644
--- a/Makefile
+++ b/Makefile
@@ -111,6 +111,7 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
stream/stream.a \
libswscale/libswscale.a \
osdep/libosdep.a \
+ $(EXTRA_LIB)\
$(DVDREAD_LIB) \
$(DVDNAV_LIB) \
$(CODEC_LIBS) \
@@ -124,6 +125,11 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
$(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 @@ LIBS_MPLAYER = libvo/libvo.a \
$(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 @@ ifeq ($(MENCODER),yes)
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)