ref: 2a55578a9804c56494f4c2b8eef2fbfe2cb7b46c
parent: d5affbaa3cd5c389a3283490ddb62c71acd489e8
parent: 7df69c1482eae20c11a994d8e144347ac8ff8352
author: Ethan Hugg <[email protected]>
date: Mon Jan 27 03:55:23 EST 2014
Merge pull request #208 from mstorsjo/remove-unused-mk-field Remove an unnecessary field from generated makefiles
--- a/build/gtest-targets.mk
+++ b/build/gtest-targets.mk
@@ -1,4 +1,3 @@
-GTEST_PREFIX=GTEST
GTEST_SRCDIR=gtest
GTEST_CPP_SRCS=\
$(GTEST_SRCDIR)/./src/gtest-all.cc\
--- a/build/mktargets.py
+++ b/build/mktargets.py
@@ -85,7 +85,6 @@
f = open(OUTFILE, "w")
-f.write("%s_PREFIX=%s\n"%(PREFIX, PREFIX)) 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,4 +1,3 @@
-COMMON_PREFIX=COMMON
COMMON_SRCDIR=codec/common
COMMON_CPP_SRCS=\
$(COMMON_SRCDIR)/./cpu.cpp\
--- a/codec/console/dec/targets.mk
+++ b/codec/console/dec/targets.mk
@@ -1,4 +1,3 @@
-H264DEC_PREFIX=H264DEC
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,4 +1,3 @@
-H264ENC_PREFIX=H264ENC
H264ENC_SRCDIR=codec/console/enc
H264ENC_CPP_SRCS=\
$(H264ENC_SRCDIR)/./src/read_config.cpp\
--- a/codec/decoder/targets.mk
+++ b/codec/decoder/targets.mk
@@ -1,4 +1,3 @@
-DECODER_PREFIX=DECODER
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,4 +1,3 @@
-ENCODER_PREFIX=ENCODER
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,4 +1,3 @@
-PROCESSING_PREFIX=PROCESSING
PROCESSING_SRCDIR=codec/processing
PROCESSING_CPP_SRCS=\
$(PROCESSING_SRCDIR)/./src/adaptivequantization/AdaptiveQuantization.cpp\
--- a/test/targets.mk
+++ b/test/targets.mk
@@ -1,4 +1,3 @@
-CODEC_UNITTEST_PREFIX=CODEC_UNITTEST
CODEC_UNITTEST_SRCDIR=test
CODEC_UNITTEST_CPP_SRCS=\
$(CODEC_UNITTEST_SRCDIR)/./decoder_test.cpp\