From 0d14ab27a805c23b804b6ef9bef6263e092cdfce Mon Sep 17 00:00:00 2001 From: François Revol Date: Thu, 27 Mar 2008 16:10:18 +0000 Subject: Fix building with C++ objects, variable names were inconsistent. Originally committed as revision 12608 to svn://svn.ffmpeg.org/ffmpeg/trunk --- common.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common.mak') diff --git a/common.mak b/common.mak index a8a8b256b9..11017c01e8 100644 --- a/common.mak +++ b/common.mak @@ -26,8 +26,8 @@ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ EXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS) LDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS) -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp) -OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) +SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPP_OBJS:.o=.cpp) +OBJS := $(OBJS) $(ASM_OBJS) $(CPP_OBJS) all: $(LIBNAME) $(SLIBNAME) -- cgit v1.2.3