diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-27 14:26:52 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-27 14:26:52 +0000 |
| commit | 02436df5fc811598db52afb7070f9a2dcf813324 (patch) | |
| tree | a755e8e75a5cd229f084aec4dd38b7a34ff58c57 | |
| parent | 2a86b5b99eb5121b5aea0459314bffd2cbc54ef1 (diff) | |
| download | mpv-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
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | libmpdemux/Makefile | 17 |
2 files changed, 14 insertions, 10 deletions
@@ -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]) diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 81f355120b..64344ea2e1 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -1,8 +1,11 @@ -LIBNAME = libmpdemux.a - include ../config.mak +LIBNAME = libmpdemux.a +ifeq ($(MENCODER),yes) +LIBNAME2 = libmpmux.a +endif + # Headers and header-dumpers SRCS = mp3_hdr.c \ mpeg_hdr.c \ @@ -63,18 +66,14 @@ SRCS-$(STREAMING_LIVE555) += demux_rtp.cpp demux_rtp_codec.cpp SRCS-$(WIN32DLL) += demux_avs.c SRCS-$(XMMS_PLUGINS) += demux_xmms.c -# Muxers -MUXERS = muxer.c \ +SRCS2 = muxer.c \ muxer_avi.c \ muxer_mpeg.c \ muxer_rawaudio.c \ muxer_rawvideo.c \ -MUXERS-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c -MUXERS-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c - -SRCS-$(MENCODER) += $(MUXERS) -SRCS-$(MENCODER) += $(MUXERS-yes) +SRCS2-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c +SRCS2-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec |