From 1571c9ef9c443d7e0267d60e69d180ec1e98d05b Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Wed, 22 Jun 2016 09:12:49 -0700 Subject: [PATCH] Update pretty and pretty-check make variables. (#192) --- configure.ac | 8 +++++--- tests/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 989162280..5d5575d87 100644 --- a/configure.ac +++ b/configure.ac @@ -270,6 +270,7 @@ AM_CONDITIONAL([OPENTHREAD_BUILD_OPTIMIZED], [test "${nl_cv_build_optimized}" = AC_SUBST(PRETTY, ["\${abs_top_srcdir}/.astyle/astyle-wrap.sh"]) AC_SUBST(PRETTY_ARGS, ["astyle --options=\${abs_top_builddir}/.astyle/astyle-opts"]) +AC_SUBST(PRETTY_CHECK, ["\${abs_top_srcdir}/.astyle/astyle-wrap.sh"]) AC_SUBST(PRETTY_CHECK_ARGS, ["astyle --options=\${abs_top_builddir}/.astyle/astyle-opts --dry-run"]) # @@ -592,9 +593,10 @@ AC_MSG_NOTICE([ C++ Compile flags : ${CXXFLAGS:--} Link flags : ${LDFLAGS:--} Link libraries : ${LIBS} - Astyle : ${PRETTY} - Astyle pretty args : ${PRETTY_ARGS} - Astyle pretty check args : ${PRETTY_CHECK_ARGS} + Pretty : ${PRETTY:--} + Pretty args : ${PRETTY_ARGS:--} + Pretty check : ${PRETTY_CHECK:--} + Pretty check args : ${PRETTY_CHECK_ARGS:--} OpenThread CLI support : ${enable_cli} OpenThread NCP support : ${enable_ncp} OpenThread examples : ${OPENTHREAD_EXAMPLES} diff --git a/tests/Makefile.am b/tests/Makefile.am index 1d9a05572..e3cfabb58 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -70,7 +70,7 @@ $(OPENTHREAD_COVERAGE_BUNDLE): $(OPENTHREAD_COVERAGE_INFO): check | $(dir $(OPENTHREAD_COVERAGE_INFO)) $(call generate-coverage-report,${top_builddir}) -coverage: $(OPENTHREAD_COVERAGE_INFO) +coverage-local: $(OPENTHREAD_COVERAGE_INFO) clean-local: clean-local-coverage