Give more descriptive names to the source and library variables and split
[mplayer.git] / libmpdemux / Makefile
index 41211f5..411e79e 100644 (file)
@@ -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 \
@@ -21,7 +19,6 @@ SRCS  = asfheader.c \
         demux_mf.c \
         demux_mkv.c ebml.c \
         demux_mov.c \
-        demux_mpc.c \
         demux_mpg.c \
         demux_nsv.c \
         demux_nuv.c \
@@ -49,34 +46,32 @@ 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-$(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
 
-LIBAV_INC-$(CONFIG_LIBAVUTIL)   += -I../libavutil
-LIBAV_INC-$(CONFIG_LIBAVCODEC)  += -I../libavcodec
-LIBAV_INC-$(CONFIG_LIBAVFORMAT) += -I../libavformat
+CFLAGS = -I../stream -I../loader
 
-CFLAGS = -I../stream -I../loader $(LIBAV_INC)
+CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../libavutil
+CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
+CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
 
-CPLUSPLUSFLAGS  = $(CFLAGS) -D__STDC_LIMIT_MACROS
-
-.cpp.o:
-       $(CC) -c $(CPLUSPLUSFLAGS) -o $@ $<
+CXXFLAGS  = $(subst -Wdeclaration-after-statement,,$(CFLAGS)) -D__STDC_LIMIT_MACROS
 
 include ../mpcommon.mak