[MPlayer-cvslog] CVS: main/libmpdemux Makefile,1.100,1.101

Diego Biurrun CVS syncmail at mplayerhq.hu
Mon Feb 6 17:04:19 CET 2006


CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv16829/libmpdemux

Modified Files:
	Makefile 
Log Message:
Build muxers only when MEncoder is enabled.


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- Makefile	27 Jan 2006 00:06:38 -0000	1.100
+++ Makefile	6 Feb 2006 16:04:17 -0000	1.101
@@ -101,7 +101,7 @@
 endif
 
 # Muxers
-SRCS += muxer.c \
+MUXERS = muxer.c \
         muxer_avi.c \
         muxer_mpeg.c \
         muxer_rawaudio.c \
@@ -116,12 +116,12 @@
 endif
 ifeq ($(CONFIG_LIBAVFORMAT),yes)
 LIBAV_INC += -I../libavformat
-SRCS += demux_lavf.c \
-	muxer_lavf.c
+SRCS   += demux_lavf.c
+MUXERS += muxer_lavf.c
 endif
 ifeq ($(CONFIG_LIBAVFORMAT_SO),yes)
-SRCS += demux_lavf.c \
-	muxer_lavf.c
+SRCS   += demux_lavf.c
+MUXERS += muxer_lavf.c
 endif
 
 ifeq ($(MPLAYER_NETWORK),yes)
@@ -152,6 +152,10 @@
 SRCS += dvb_tune.c
 endif
 
+ifeq ($(MENCODER),yes)
+SRCS += $(MUXERS)
+endif
+
 OBJS	= $(SRCS:.c=.o)
 OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
 INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)




More information about the MPlayer-cvslog mailing list