diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-26 13:04:14 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-26 13:04:14 +0000 |
| commit | c95db8d583d9f6a773865afe133340966334a86a (patch) | |
| tree | 9695ca2823526dde4100bec4b506fa77aecb536a /libmpdemux | |
| parent | 7d6341459abd8f62ed3f62ce9ef526cafc98d776 (diff) | |
| download | mpv-c95db8d583d9f6a773865afe133340966334a86a.tar.bz2 mpv-c95db8d583d9f6a773865afe133340966334a86a.tar.xz | |
Simplify, remove useless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21263 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 849691ef8c..c6e0f8955b 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -100,15 +100,14 @@ SRCS += $(MUXERS) 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 @@ all: $(LIBNAME) .c.o: $(CC) -c $(CFLAGS) -o $@ $< .cpp.o: - $(CPLUSPLUS) -c $(CPLUSPLUSFLAGS) -o $@ $< + $(CC) -c $(CPLUSPLUSFLAGS) -o $@ $< $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) |