Mercurial > mplayer.hg
changeset 21310:3220773a071b
Split muxers into a separate library that only MEncoder is linked against.
| author | diego |
|---|---|
| date | Mon, 27 Nov 2006 14:26:52 +0000 |
| parents | ef59ac68c9b6 |
| children | 3e29b787f3b8 |
| files | Makefile libmpdemux/Makefile |
| diffstat | 2 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Nov 27 13:42:36 2006 +0000 +++ b/Makefile Mon Nov 27 14:26:52 2006 +0000 @@ -66,6 +66,7 @@ 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 @@ $(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 @@ 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])
--- a/libmpdemux/Makefile Mon Nov 27 13:42:36 2006 +0000 +++ b/libmpdemux/Makefile Mon Nov 27 14:26:52 2006 +0000 @@ -1,7 +1,10 @@ + +include ../config.mak LIBNAME = libmpdemux.a - -include ../config.mak +ifeq ($(MENCODER),yes) +LIBNAME2 = libmpmux.a +endif # Headers and header-dumpers SRCS = mp3_hdr.c \ @@ -63,18 +66,14 @@ 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