diff libmpdemux/Makefile @ 22528:8bcff5c7e387

Give more descriptive names to the source and library variables and split between common, MPlayer-specific and MEncoder-specific parts.

--- a/libmpdemux/Makefile	Tue Mar 13 10:33:33 2007 +0000
+++ b/libmpdemux/Makefile	Tue Mar 13 12:10:57 2007 +0000
@@ -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 @@
         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