summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-31 17:39:17 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-31 17:39:17 +0000
commit49867bd432352d19172ab26cf873bd5651e69e25 (patch)
treec2d419bb4f81564036baa12832a44b8aac27c6d1 /Makefile
parentd3b998da64927403879ad588287c178f86b7c849 (diff)
downloadmpv-49867bd432352d19172ab26cf873bd5651e69e25.tar.bz2
mpv-49867bd432352d19172ab26cf873bd5651e69e25.tar.xz
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 45786f10bc..b6e7167268 100644
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,7 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
$(W32_LIB) \
libaf/libaf.a \
libmpdemux/libmpdemux.a \
+ stream/stream.a \
libswscale/libswscale.a \
osdep/libosdep.a \
$(DVDREAD_LIB) \
@@ -139,6 +140,7 @@ CODEC_LIBS += $(FAAC_LIB)
endif
PARTS = libmpdemux \
+ stream \
libmpcodecs \
libavutil \
libavcodec \
@@ -195,6 +197,7 @@ endif
COMMON_DEPS = $(W32_DEP) \
$(AV_DEP) \
libmpdemux/libmpdemux.a \
+ stream/stream.a \
libmpcodecs/libmpcodecs.a \
libao2/libao2.a \
osdep/libosdep.a \
@@ -274,6 +277,9 @@ libass/libass.a:
libmpdemux/libmpdemux.a:
$(MAKE) -C libmpdemux
+stream/stream.a:
+ $(MAKE) -C stream
+
libmpcodecs/libmpcodecs.a:
$(MAKE) -C libmpcodecs
@@ -546,6 +552,7 @@ libaf/libaf.a: $(wildcard libaf/*.[ch])
libmpdvdkit2/libmpdvdkit.a: $(wildcard libmpdvdkit2/*.[ch])
libmpdemux/libmpdemux.a: $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
+stream/stream.a: $(wildcard stream/*.[ch] stream/*/*.[ch])
libmpcodecs/libmpcodecs.a: $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch])
libmpcodecs/libmpencoders.a: $(wildcard libmpcodecs/*.[ch])