ref: ce22f84a2b2c95ce5acc6a98863266379e2d430d
parent: 0c35e4385de2f82f3c698885894a4eac862b0ffa
author: Martin Storsjö <martin@martin.st>
date: Wed Feb 12 17:11:05 EST 2014
Regenerate target makefiles after the latest mktargets.py changes
--- a/build/gtest-targets.mk
+++ b/build/gtest-targets.mk
@@ -3,6 +3,7 @@
$(GTEST_SRCDIR)/src/gtest-all.cc\
GTEST_OBJS += $(GTEST_CPP_SRCS:.cc=.o)
+
OBJS += $(GTEST_OBJS)
$(GTEST_SRCDIR)/%.o: $(GTEST_SRCDIR)/%.cc
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(GTEST_CFLAGS) $(GTEST_INCLUDES) -c $(CXX_O) $<
--- a/codec/common/targets.mk
+++ b/codec/common/targets.mk
@@ -7,6 +7,7 @@
$(COMMON_SRCDIR)/WelsThreadLib.cpp\
COMMON_OBJS += $(COMMON_CPP_SRCS:.cpp=.o)
+
ifeq ($(USE_ASM), Yes)
COMMON_ASM_SRCS=\
$(COMMON_SRCDIR)/asm_inc.asm\
--- a/codec/console/dec/targets.mk
+++ b/codec/console/dec/targets.mk
@@ -5,6 +5,7 @@
$(H264DEC_SRCDIR)/src/read_config.cpp\
H264DEC_OBJS += $(H264DEC_CPP_SRCS:.cpp=.o)
+
OBJS += $(H264DEC_OBJS)
$(H264DEC_SRCDIR)/%.o: $(H264DEC_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(H264DEC_CFLAGS) $(H264DEC_INCLUDES) -c $(CXX_O) $<
--- a/codec/console/enc/targets.mk
+++ b/codec/console/enc/targets.mk
@@ -4,6 +4,7 @@
$(H264ENC_SRCDIR)/src/welsenc.cpp\
H264ENC_OBJS += $(H264ENC_CPP_SRCS:.cpp=.o)
+
OBJS += $(H264ENC_OBJS)
$(H264ENC_SRCDIR)/%.o: $(H264ENC_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(H264ENC_CFLAGS) $(H264ENC_INCLUDES) -c $(CXX_O) $<
--- a/codec/decoder/targets.mk
+++ b/codec/decoder/targets.mk
@@ -24,6 +24,7 @@
$(DECODER_SRCDIR)/plus/src/welsDecoderExt.cpp\
DECODER_OBJS += $(DECODER_CPP_SRCS:.cpp=.o)
+
ifeq ($(USE_ASM), Yes)
DECODER_ASM_SRCS=\
$(DECODER_SRCDIR)/core/asm/block_add.asm\
--- a/codec/encoder/targets.mk
+++ b/codec/encoder/targets.mk
@@ -34,6 +34,7 @@
$(ENCODER_SRCDIR)/plus/src/welsEncoderExt.cpp\
ENCODER_OBJS += $(ENCODER_CPP_SRCS:.cpp=.o)
+
ifeq ($(USE_ASM), Yes)
ENCODER_ASM_SRCS=\
$(ENCODER_SRCDIR)/core/asm/coeff.asm\
--- a/codec/processing/targets.mk
+++ b/codec/processing/targets.mk
@@ -19,6 +19,7 @@
$(PROCESSING_SRCDIR)/src/vaacalc/vaacalculation.cpp\
PROCESSING_OBJS += $(PROCESSING_CPP_SRCS:.cpp=.o)
+
ifeq ($(USE_ASM), Yes)
PROCESSING_ASM_SRCS=\
$(PROCESSING_SRCDIR)/src/asm/denoisefilter.asm\
--- a/test/targets.mk
+++ b/test/targets.mk
@@ -2,16 +2,16 @@
CODEC_UNITTEST_CPP_SRCS=\
$(CODEC_UNITTEST_SRCDIR)/BaseDecoderTest.cpp\
$(CODEC_UNITTEST_SRCDIR)/BaseEncoderTest.cpp\
+ $(CODEC_UNITTEST_SRCDIR)/cpp_interface_test.cpp\
$(CODEC_UNITTEST_SRCDIR)/decode_encode_test.cpp\
$(CODEC_UNITTEST_SRCDIR)/decoder_test.cpp\
$(CODEC_UNITTEST_SRCDIR)/encoder_test.cpp\
$(CODEC_UNITTEST_SRCDIR)/simple_test.cpp\
- $(CODEC_UNITTEST_SRCDIR)/./cpp_interface_test.cpp\
CODEC_UNITTEST_OBJS += $(CODEC_UNITTEST_CPP_SRCS:.cpp=.o)
CODEC_UNITTEST_C_SRCS=\
- $(CODEC_UNITTEST_SRCDIR)/./c_interface_test.c\
+ $(CODEC_UNITTEST_SRCDIR)/c_interface_test.c\
CODEC_UNITTEST_OBJS += $(CODEC_UNITTEST_C_SRCS:.c=.o)
@@ -20,7 +20,7 @@
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(CODEC_UNITTEST_CFLAGS) $(CODEC_UNITTEST_INCLUDES) -c $(CXX_O) $<
$(CODEC_UNITTEST_SRCDIR)/%.o: $(CODEC_UNITTEST_SRCDIR)/%.c
- $(QUIET_CXX)$(CC) $(CFLAGS) $(INCLUDES) $(CODEC_UNITTEST_CFLAGS) $(CODEC_UNITTEST_INCLUDES) -c $(CXX_O) $<
+ $(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) $(CODEC_UNITTEST_CFLAGS) $(CODEC_UNITTEST_INCLUDES) -c $(CXX_O) $<
codec_unittest$(EXEEXT): $(CODEC_UNITTEST_OBJS) $(LIBS) $(CODEC_UNITTEST_LIBS) $(CODEC_UNITTEST_DEPS)
$(QUIET_CXX)$(CXX) $(CXX_LINK_O) $(CODEC_UNITTEST_OBJS) $(CODEC_UNITTEST_LDFLAGS) $(CODEC_UNITTEST_LIBS) $(LDFLAGS) $(LIBS)