summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-13 12:10:57 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-13 12:10:57 +0000
commit60b39e278621374569859f78170c1c170bf84c85 (patch)
treea534407525d96137730d8880e7dfe07d93f77f60 /libmpdemux
parent39414b500ab130de25730121b5a5bb4c03f4ad32 (diff)
downloadmpv-60b39e278621374569859f78170c1c170bf84c85.tar.bz2
mpv-60b39e278621374569859f78170c1c170bf84c85.tar.xz
Give more descriptive names to the source and library variables and split
between common, MPlayer-specific and MEncoder-specific parts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22546 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/Makefile34
1 files changed, 16 insertions, 18 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 96c41faf57..411e79e623 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -1,12 +1,10 @@
include ../config.mak
-LIBNAME = libmpdemux.a
-ifeq ($(MENCODER),yes)
-LIBNAME2 = libmpmux.a
-endif
+LIBNAME_COMMON = libmpdemux.a
+LIBNAME_MENCODER = libmpmux.a
-SRCS = asfheader.c \
+SRCS_COMMON = asfheader.c \
aviheader.c \
aviprint.c \
demuxer.c \
@@ -48,25 +46,25 @@ SRCS = asfheader.c \
yuv4mpeg.c \
yuv4mpeg_ratio.c \
-SRCS-$(CONFIG_LIBAVFORMAT) += demux_lavf.c
-SRCS-$(CONFIG_LIBAVFORMAT_SO) += demux_lavf.c
-SRCS-$(GIF) += demux_gif.c
-SRCS-$(LIBDV) += demux_rawdv.c
-SRCS-$(LIBNUT) += demux_nut.c
-SRCS-$(LIBVORBIS) += demux_ogg.c
-SRCS-$(MUSEPACK) += demux_mpc.c
-SRCS-$(STREAMING_LIVE555) += demux_rtp.cpp demux_rtp_codec.cpp
-SRCS-$(WIN32DLL) += demux_avs.c
-SRCS-$(XMMS_PLUGINS) += demux_xmms.c
+SRCS_COMMON-$(CONFIG_LIBAVFORMAT) += demux_lavf.c
+SRCS_COMMON-$(CONFIG_LIBAVFORMAT_SO) += demux_lavf.c
+SRCS_COMMON-$(GIF) += demux_gif.c
+SRCS_COMMON-$(LIBDV) += demux_rawdv.c
+SRCS_COMMON-$(LIBNUT) += demux_nut.c
+SRCS_COMMON-$(LIBVORBIS) += demux_ogg.c
+SRCS_COMMON-$(MUSEPACK) += demux_mpc.c
+SRCS_COMMON-$(STREAMING_LIVE555) += demux_rtp.cpp demux_rtp_codec.cpp
+SRCS_COMMON-$(WIN32DLL) += demux_avs.c
+SRCS_COMMON-$(XMMS_PLUGINS) += demux_xmms.c
-SRCS2 = muxer.c \
+SRCS_MENCODER = muxer.c \
muxer_avi.c \
muxer_mpeg.c \
muxer_rawaudio.c \
muxer_rawvideo.c \
-SRCS2-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c
-SRCS2-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c
+SRCS_MENCODER-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c
+SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c
CFLAGS = -I../stream -I../loader