BIND 10 trac1698-test, updated. a167e7085865d77a1a9311a5cfae067da988d5ac [1698-test] Modified Makefile to use AM_ macros
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Mar 12 13:24:18 UTC 2012
The branch, trac1698-test has been updated
via a167e7085865d77a1a9311a5cfae067da988d5ac (commit)
from 292fc936f6bfbcf84e56e67b52a16368a726d32f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a167e7085865d77a1a9311a5cfae067da988d5ac
Author: Stephen Morris <stephen at isc.org>
Date: Mon Mar 12 13:22:03 2012 +0000
[1698-test] Modified Makefile to use AM_ macros
Use AM_ macros for makefile-specific options. (Use of COMMON_
variables provoked a warning on some variants of autotools.)
-----------------------------------------------------------------------
Summary of changes:
src/lib/log/tests/Makefile.am | 88 ++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 44 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index 4e9b63f..c07eb4a 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -3,31 +3,50 @@ SUBDIRS = .
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS)
+AM_LDADD =
+AM_LDFLAGS =
if USE_STATIC_LINK
-AM_LDFLAGS = -static
+AM_LDFLAGS += -static
endif
CLEANFILES = *.gcno *.gcda
-TESTS =
+noinst_PROGRAMS = logger_example
+logger_example_SOURCES = logger_example.cc
+logger_example_CPPFLAGS = $(AM_CPPFLAGS)
+logger_example_LDFLAGS = $(AM_LDFLAGS)
+logger_example_LDADD = $(AM_LDADD) $(LOG4CPLUS_LIBS)
+logger_example_LDADD += $(top_builddir)/src/lib/log/liblog.la
+logger_example_LDADD += $(top_builddir)/src/lib/util/libutil.la
+logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+
+noinst_PROGRAMS += init_logger_test
+init_logger_test_SOURCES = init_logger_test.cc
+init_logger_test_CPPFLAGS = $(AM_CPPFLAGS)
+init_logger_test_LDFLAGS = $(AM_LDFLAGS)
+init_logger_test_LDADD = $(AM_LDADD) $(LOG4CPLUS_LIBS)
+init_logger_test_LDADD += $(top_builddir)/src/lib/log/liblog.la
+init_logger_test_LDADD += $(top_builddir)/src/lib/util/libutil.la
+init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+
if HAVE_GTEST
+TESTS =
# Define the flags used in each set of tests
-COMMON_CXXFLAGS = $(AM_CXXFLAGS)
if USE_CLANGPP
# Workaround unused variables tcout and tcerr in log4cplus's streams.h.
-COMMON_CXXFLAGS += -Wno-unused-variable
+AM_CXXFLAGS += -Wno-unused-variable
endif
-COMMON_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
-COMMON_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+AM_CPPFLAGS += $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
+AM_LDFLAGS += $(GTEST_LDFLAGS)
-COMMON_LDADD = $(GTEST_LDADD)
-COMMON_LDADD += $(top_builddir)/src/lib/log/liblog.la
-COMMON_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-COMMON_LDADD += $(top_builddir)/src/lib/util/libutil.la
-COMMON_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-COMMON_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+AM_LDADD += $(GTEST_LDADD)
+AM_LDADD += $(top_builddir)/src/lib/log/liblog.la
+AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
+AM_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
# Set of unit tests for the general logging classes
TESTS += run_unittests
@@ -44,10 +63,10 @@ run_unittests_SOURCES += message_dictionary_unittest.cc
run_unittests_SOURCES += message_reader_unittest.cc
run_unittests_SOURCES += output_option_unittest.cc
-run_unittests_CPPFLAGS = $(COMMON_CPPFLAGS)
-run_unittests_CXXFLAGS = $(COMMON_CXXFLAGS)
-run_unittests_LDADD = $(COMMON_LDADD)
-run_unittests_LDFLAGS = $(COMMON_LDFLAGS)
+run_unittests_CPPFLAGS = $(AM_CPPFLAGS)
+run_unittests_CXXFLAGS = $(AM_CXXFLAGS)
+run_unittests_LDADD = $(AM_LDADD)
+run_unittests_LDFLAGS = $(AM_LDFLAGS)
# logging initialization tests. These are put in separate programs to
# ensure that the initialization status at the start of each test is known,
@@ -58,41 +77,22 @@ initializer_unittests_1_SOURCES = run_initializer_unittests.cc
initializer_unittests_1_SOURCES += message_initializer_1_unittest.cc
initializer_unittests_1_SOURCES += message_initializer_1a_unittest.cc
-initializer_unittests_1_CPPFLAGS = $(COMMON_CPPFLAGS)
-initializer_unittests_1_CXXFLAGS = $(COMMON_CXXFLAGS)
-initializer_unittests_1_LDADD = $(COMMON_LDADD)
-initializer_unittests_1_LDFLAGS = $(COMMON_LDFLAGS)
+initializer_unittests_1_CPPFLAGS = $(AM_CPPFLAGS)
+initializer_unittests_1_CXXFLAGS = $(AM_CXXFLAGS)
+initializer_unittests_1_LDADD = $(AM_LDADD)
+initializer_unittests_1_LDFLAGS = $(AM_LDFLAGS)
TESTS += initializer_unittests_2
initializer_unittests_2_SOURCES = run_initializer_unittests.cc
initializer_unittests_2_SOURCES += message_initializer_2_unittest.cc
-initializer_unittests_2_CPPFLAGS = $(COMMON_CPPFLAGS)
-initializer_unittests_2_CXXFLAGS = $(COMMON_CXXFLAGS)
-initializer_unittests_2_LDADD = $(COMMON_LDADD)
-initializer_unittests_2_LDFLAGS = $(COMMON_LDFLAGS)
-
-endif
-
-noinst_PROGRAMS = logger_example
-logger_example_SOURCES = logger_example.cc
-logger_example_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-logger_example_LDFLAGS = $(AM_LDFLAGS)
-logger_example_LDADD = $(LOG4CPLUS_LIBS)
-logger_example_LDADD += $(top_builddir)/src/lib/log/liblog.la
-logger_example_LDADD += $(top_builddir)/src/lib/util/libutil.la
-logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-
-noinst_PROGRAMS += init_logger_test
-init_logger_test_SOURCES = init_logger_test.cc
-init_logger_test_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-init_logger_test_LDFLAGS = $(AM_LDFLAGS)
-init_logger_test_LDADD = $(LOG4CPLUS_LIBS)
-init_logger_test_LDADD += $(top_builddir)/src/lib/log/liblog.la
-init_logger_test_LDADD += $(top_builddir)/src/lib/util/libutil.la
-init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+initializer_unittests_2_CPPFLAGS = $(AM_CPPFLAGS)
+initializer_unittests_2_CXXFLAGS = $(AM_CXXFLAGS)
+initializer_unittests_2_LDADD = $(AM_LDADD)
+initializer_unittests_2_LDFLAGS = $(AM_LDFLAGS)
noinst_PROGRAMS += $(TESTS)
+endif
# Additional test using the shell. These are principally tests
# where the global logging environment is affected, and where the
More information about the bind10-changes
mailing list