shithub: openh264

Download patch

ref: 263cb539001007fd71634fb8463bf352f02368e1
parent: 2fcee023fef209576af653e3d081becabc5b12e5
parent: b1e34b08d08a3f32e8c1373fdd5458d8ad14de0b
author: sijchen <sijchen@cisco.com>
date: Fri Aug 24 07:32:18 EDT 2018

Merge pull request #3008 from mstorsjo/targets.mk-warning

Add a warning in targets.mk files about them being autogenerated

--- a/build/gtest-targets.mk
+++ b/build/gtest-targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 GTEST_SRCDIR=gtest/googletest
 GTEST_CPP_SRCS=\
 	$(GTEST_SRCDIR)/src/gtest-all.cc\
--- a/build/mktargets.py
+++ b/build/mktargets.py
@@ -121,6 +121,10 @@
 
 
 f = open(OUTFILE, "w")
+f.write("# This file is autogenerated, do not edit it directly, edit build/mktargets.py\n")
+f.write("# instead. To regenerate files, run build/mktargets.sh.\n")
+f.write("\n")
+
 f.write("%s_SRCDIR=%s\n"%(PREFIX, args.directory))
 
 f.write("%s_CPP_SRCS=\\\n"%(PREFIX))
--- a/codec/common/targets.mk
+++ b/codec/common/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 COMMON_SRCDIR=codec/common
 COMMON_CPP_SRCS=\
 	$(COMMON_SRCDIR)/src/common_tables.cpp\
--- a/codec/console/common/targets.mk
+++ b/codec/console/common/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 CONSOLE_COMMON_SRCDIR=codec/console/common
 CONSOLE_COMMON_CPP_SRCS=\
 	$(CONSOLE_COMMON_SRCDIR)/src/read_config.cpp\
--- a/codec/console/dec/targets.mk
+++ b/codec/console/dec/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 H264DEC_SRCDIR=codec/console/dec
 H264DEC_CPP_SRCS=\
 	$(H264DEC_SRCDIR)/src/d3d9_utils.cpp\
--- a/codec/console/enc/targets.mk
+++ b/codec/console/enc/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 H264ENC_SRCDIR=codec/console/enc
 H264ENC_CPP_SRCS=\
 	$(H264ENC_SRCDIR)/src/welsenc.cpp\
--- a/codec/decoder/targets.mk
+++ b/codec/decoder/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 DECODER_SRCDIR=codec/decoder
 DECODER_CPP_SRCS=\
 	$(DECODER_SRCDIR)/core/src/au_parser.cpp\
--- a/codec/encoder/targets.mk
+++ b/codec/encoder/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 ENCODER_SRCDIR=codec/encoder
 ENCODER_CPP_SRCS=\
 	$(ENCODER_SRCDIR)/core/src/au_set.cpp\
--- a/codec/processing/targets.mk
+++ b/codec/processing/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 PROCESSING_SRCDIR=codec/processing
 PROCESSING_CPP_SRCS=\
 	$(PROCESSING_SRCDIR)/src/adaptivequantization/AdaptiveQuantization.cpp\
--- a/module/targets.mk
+++ b/module/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 MODULE_SRCDIR=module
 MODULE_CPP_SRCS=\
 	$(MODULE_SRCDIR)/gmp-openh264.cpp\
--- a/test/api/targets.mk
+++ b/test/api/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 API_TEST_SRCDIR=test/api
 API_TEST_CPP_SRCS=\
 	$(API_TEST_SRCDIR)/BaseDecoderTest.cpp\
--- a/test/common/targets.mk
+++ b/test/common/targets.mk
@@ -1,9 +1,12 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 COMMON_UNITTEST_SRCDIR=test/common
 COMMON_UNITTEST_CPP_SRCS=\
 	$(COMMON_UNITTEST_SRCDIR)/CWelsListTest.cpp\
 	$(COMMON_UNITTEST_SRCDIR)/ExpandPicture.cpp\
-	$(COMMON_UNITTEST_SRCDIR)/WelsThreadPoolTest.cpp\
 	$(COMMON_UNITTEST_SRCDIR)/WelsTaskListTest.cpp\
+	$(COMMON_UNITTEST_SRCDIR)/WelsThreadPoolTest.cpp\
 
 COMMON_UNITTEST_OBJS += $(COMMON_UNITTEST_CPP_SRCS:.cpp=.$(OBJ))
 
--- a/test/decoder/targets.mk
+++ b/test/decoder/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 DECODER_UNITTEST_SRCDIR=test/decoder
 DECODER_UNITTEST_CPP_SRCS=\
 	$(DECODER_UNITTEST_SRCDIR)/DecUT_Deblock.cpp\
--- a/test/encoder/targets.mk
+++ b/test/encoder/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 ENCODER_UNITTEST_SRCDIR=test/encoder
 ENCODER_UNITTEST_CPP_SRCS=\
 	$(ENCODER_UNITTEST_SRCDIR)/EncUT_Cavlc.cpp\
@@ -17,8 +20,8 @@
 	$(ENCODER_UNITTEST_SRCDIR)/EncUT_ParameterSetStrategy.cpp\
 	$(ENCODER_UNITTEST_SRCDIR)/EncUT_Reconstruct.cpp\
 	$(ENCODER_UNITTEST_SRCDIR)/EncUT_Sample.cpp\
-	$(ENCODER_UNITTEST_SRCDIR)/EncUT_SVC_me.cpp\
 	$(ENCODER_UNITTEST_SRCDIR)/EncUT_SliceBufferReallocate.cpp\
+	$(ENCODER_UNITTEST_SRCDIR)/EncUT_SVC_me.cpp\
 
 ENCODER_UNITTEST_OBJS += $(ENCODER_UNITTEST_CPP_SRCS:.cpp=.$(OBJ))
 
--- a/test/processing/targets.mk
+++ b/test/processing/targets.mk
@@ -1,3 +1,6 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
 PROCESSING_UNITTEST_SRCDIR=test/processing
 PROCESSING_UNITTEST_CPP_SRCS=\
 	$(PROCESSING_UNITTEST_SRCDIR)/ProcessUT_AdaptiveQuantization.cpp\