summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-27 14:26:52 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-27 14:26:52 +0000
commit02436df5fc811598db52afb7070f9a2dcf813324 (patch)
treea755e8e75a5cd229f084aec4dd38b7a34ff58c57 /Makefile
parent2a86b5b99eb5121b5aea0459314bffd2cbc54ef1 (diff)
downloadmpv-02436df5fc811598db52afb7070f9a2dcf813324.tar.bz2
mpv-02436df5fc811598db52afb7070f9a2dcf813324.tar.xz
Split muxers into a separate library that only MEncoder is linked against.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0b2f7098d2..e09d6fd88d 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,7 @@ LIBS_MPLAYER = libvo/libvo.a \
input/libinput.a \
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
+ libmpdemux/libmpmux.a \
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
@@ -165,7 +166,10 @@ libass/libass.a:
$(MAKE) -C libass
libmpdemux/libmpdemux.a:
- $(MAKE) -C libmpdemux
+ $(MAKE) -C libmpdemux libmpdemux.a
+
+libmpdemux/libmpmux.a:
+ $(MAKE) -C libmpdemux libmpmux.a
stream/stream.a:
$(MAKE) -C stream
@@ -393,6 +397,7 @@ dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch])
libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch])
libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch])
+libmpdemux/libmpmux.a: .norecurse $(wildcard libmpdemux/*.[ch])
stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch])
libmpcodecs/libmpcodecs.a: .norecurse $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch])
libmpcodecs/libmpencoders.a: .norecurse $(wildcard libmpcodecs/*.[ch])