# HG changeset patch # User diego # Date 1154643501 0 # Node ID d9e836da50931771608afcfec772dd9d3582debf # Parent cc4774869fbcdd4e4c9693f5628fe1fd7e06549a Forgotten part of the LIVE555 configure test simplification. diff -r cc4774869fbc -r d9e836da5093 libmpdemux/Makefile --- a/libmpdemux/Makefile Thu Aug 03 20:44:14 2006 +0000 +++ b/libmpdemux/Makefile Thu Aug 03 22:18:21 2006 +0000 @@ -99,14 +99,13 @@ ifeq ($(STREAMING_LIVE555),yes) CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp -CPLUSPLUSINCLUDE = $(LIVE_INCLUDES) endif OBJS = $(SRCS:.c=.o) OBJS += $(CPLUSPLUSSRCS:.cpp=.o) INCLUDE = -I.. -I../stream -I../loader $(LIBAV_INC) CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) -CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS +CPLUSPLUSFLAGS = $(CFLAGS) -D__STDC_LIMIT_MACROS CPLUSPLUS = $(CC) .SUFFIXES: .c .cpp .o