ref: 17d7aa13e45636311aa4882c34a341ff744ad8e8
parent: 30da4f196ec88ffe1cada8bc820f4e60d9bc8644
parent: 81493590f863dfff19a396dc9a45e0dd7d60e5d3
author: ruil2 <ruil2@cisco.com>
date: Fri Mar 25 05:36:53 EDT 2016
Merge pull request #2427 from mstorsjo/mktargets Refresh regenerating targets.mk
--- a/build/mktargets.sh
+++ b/build/mktargets.sh
@@ -14,4 +14,4 @@
python build/mktargets.py --directory test/api --prefix api_test
python build/mktargets.py --directory test/common --prefix common_unittest
python build/mktargets.py --directory module --prefix module
-python build/mktargets.py --directory gtest --library gtest --out build/gtest-targets.mk --cpp-suffix .cc --include gtest-all.cc
+python build/mktargets.py --directory gtest/googletest --library gtest --out build/gtest-targets.mk --cpp-suffix .cc --include gtest-all.cc
--- a/test/api/targets.mk
+++ b/test/api/targets.mk
@@ -14,7 +14,6 @@
$(API_TEST_SRCDIR)/ltr_test.cpp\
$(API_TEST_SRCDIR)/simple_test.cpp\
-
API_TEST_OBJS += $(API_TEST_CPP_SRCS:.cpp=.$(OBJ))
API_TEST_C_SRCS=\