Mercurial > mplayer.hg

changeset 21247:c0400a8091a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify, remove useless indirection.
author diego
date Sun, 26 Nov 2006 13:04:14 +0000
parents 4fb09861b4eb
children 2de480457872
files libmpdemux/Makefile
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/Makefile	Sun Nov 26 13:02:02 2006 +0000
+++ b/libmpdemux/Makefile	Sun Nov 26 13:04:14 2006 +0000
@@ -100,15 +100,14 @@
 endif
 
 ifeq ($(STREAMING_LIVE555),yes)
-CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp
+SRCS += demux_rtp.cpp demux_rtp_codec.cpp
 endif
 
 OBJS	= $(SRCS:.c=.o)
-OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
+OBJS   += $(SRCS:.cpp=.o)
 INCLUDE = -I.. -I../stream -I../loader $(LIBAV_INC)
 CFLAGS  = $(INCLUDE) $(OPTFLAGS)
 CPLUSPLUSFLAGS  = $(CFLAGS) -D__STDC_LIMIT_MACROS
-CPLUSPLUS = $(CC)
 
 .SUFFIXES: .c .cpp .o
 
@@ -119,7 +118,7 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 .cpp.o:
-	$(CPLUSPLUS) -c $(CPLUSPLUSFLAGS) -o $@ $<
+	$(CC) -c $(CPLUSPLUSFLAGS) -o $@ $<
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)