From 0d14ab27a805c23b804b6ef9bef6263e092cdfce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 27 Mar 2008 16:10:18 +0000 Subject: [PATCH] Fix building with C++ objects, variable names were inconsistent. Originally committed as revision 12608 to svn://svn.ffmpeg.org/ffmpeg/trunk --- common.mak | 4 ++-- libavdevice/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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) diff --git a/libavdevice/Makefile b/libavdevice/Makefile index fb7c22b3b6..ddb0113c79 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -20,7 +20,7 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o # external libraries OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o -CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o -CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o +CPP_OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o +CPP_OBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o include ../common.mak