svn commit: r261886 - in vendor/atf/dist: . admin atf-c atf-c++ atf-c++/detail atf-c/detail atf-config atf-report atf-run atf-run/sample atf-run/share atf-sh atf-version bootstrap doc m4 tools tool...
Julio Merino
jmmv at FreeBSD.org
Fri Feb 14 14:41:27 UTC 2014
Author: jmmv
Date: Fri Feb 14 14:41:25 2014
New Revision: 261886
URL: http://svnweb.freebsd.org/changeset/base/261886
Log:
Import atf-0.19:
Experimental version released on February 7th, 2014.
This is the last release to bundle the code for the deprecated tools.
The next release will drop their code and will stop worrying about
backwards compatibility between the ATF libraries and what the old tools
may or may not support.
If you still require the old tools for some reason, grab a copy of the
'tools' directory now. The code in this directory is standalone and
does not depend on any internal details of atf-c++ any longer.
* Various fixes and improvements to support running as part of the FreeBSD
test suite.
* Project hosting moved from Google Code (as a subproject of Kyua) to
GitHub (as a first-class project). The main reason for the change is
the suppression of binary downloads in Google Code on Jan 15th, 2014.
See https://github.com/jmmv/atf/
* Removed builtin help from atf-sh(1) and atf-check(1) for simplicity
reasons. In other words, their -h option is gone.
* Moved the code of the deprecated tools into a 'tools' directory and
completely decoupled their code from the internals of atf-c++. The
reason for this is to painlessly allow a third-party to maintain a
copy of these tools after we delete them because upcoming changes to
atf-c++ would break the stale tools.
Added:
vendor/atf/dist/admin/ar-lib (contents, props changed)
vendor/atf/dist/atf-c++/detail/version_helper.cpp (contents, props changed)
vendor/atf/dist/atf-c/detail/version_helper.c (contents, props changed)
vendor/atf/dist/tools/
vendor/atf/dist/tools/Atffile
vendor/atf/dist/tools/Kyuafile (contents, props changed)
vendor/atf/dist/tools/Makefile.am.inc (contents, props changed)
vendor/atf/dist/tools/application.cpp (contents, props changed)
vendor/atf/dist/tools/application.hpp
vendor/atf/dist/tools/application_test.cpp (contents, props changed)
vendor/atf/dist/tools/atf-config.1 (contents, props changed)
vendor/atf/dist/tools/atf-config.cpp (contents, props changed)
vendor/atf/dist/tools/atf-config_test.sh (contents, props changed)
vendor/atf/dist/tools/atf-formats.5 (contents, props changed)
vendor/atf/dist/tools/atf-report.1 (contents, props changed)
vendor/atf/dist/tools/atf-report.cpp (contents, props changed)
vendor/atf/dist/tools/atf-report_test.sh (contents, props changed)
vendor/atf/dist/tools/atf-run.1 (contents, props changed)
vendor/atf/dist/tools/atf-run.cpp (contents, props changed)
vendor/atf/dist/tools/atf-run_test.sh (contents, props changed)
vendor/atf/dist/tools/atf-version.1 (contents, props changed)
vendor/atf/dist/tools/atf-version.cpp (contents, props changed)
vendor/atf/dist/tools/atf.7.in (contents, props changed)
vendor/atf/dist/tools/atffile.cpp (contents, props changed)
vendor/atf/dist/tools/atffile.hpp
vendor/atf/dist/tools/atffile_test.cpp (contents, props changed)
vendor/atf/dist/tools/auto_array.hpp
vendor/atf/dist/tools/auto_array_test.cpp (contents, props changed)
vendor/atf/dist/tools/bad_metadata_helper.c (contents, props changed)
vendor/atf/dist/tools/config.cpp (contents, props changed)
vendor/atf/dist/tools/config.hpp
vendor/atf/dist/tools/config_file.cpp (contents, props changed)
vendor/atf/dist/tools/config_file.hpp
vendor/atf/dist/tools/config_file_test.cpp (contents, props changed)
vendor/atf/dist/tools/config_test.cpp (contents, props changed)
vendor/atf/dist/tools/defs.hpp.in (contents, props changed)
vendor/atf/dist/tools/env.cpp (contents, props changed)
vendor/atf/dist/tools/env.hpp
vendor/atf/dist/tools/env_test.cpp (contents, props changed)
vendor/atf/dist/tools/exceptions.cpp (contents, props changed)
vendor/atf/dist/tools/exceptions.hpp
vendor/atf/dist/tools/expand.cpp (contents, props changed)
vendor/atf/dist/tools/expand.hpp
vendor/atf/dist/tools/expand_test.cpp (contents, props changed)
vendor/atf/dist/tools/expect_helpers.c (contents, props changed)
vendor/atf/dist/tools/fail_helper.cpp (contents, props changed)
vendor/atf/dist/tools/fs.cpp (contents, props changed)
vendor/atf/dist/tools/fs.hpp
vendor/atf/dist/tools/fs_test.cpp (contents, props changed)
vendor/atf/dist/tools/generate-revision.sh (contents, props changed)
vendor/atf/dist/tools/io.cpp (contents, props changed)
vendor/atf/dist/tools/io.hpp
vendor/atf/dist/tools/io_test.cpp (contents, props changed)
vendor/atf/dist/tools/misc_helpers.cpp (contents, props changed)
vendor/atf/dist/tools/parser.cpp (contents, props changed)
vendor/atf/dist/tools/parser.hpp
vendor/atf/dist/tools/parser_test.cpp (contents, props changed)
vendor/atf/dist/tools/pass_helper.cpp (contents, props changed)
vendor/atf/dist/tools/process.cpp (contents, props changed)
vendor/atf/dist/tools/process.hpp
vendor/atf/dist/tools/process_helpers.c (contents, props changed)
vendor/atf/dist/tools/process_test.cpp (contents, props changed)
vendor/atf/dist/tools/reader.cpp (contents, props changed)
vendor/atf/dist/tools/reader.hpp
vendor/atf/dist/tools/reader_test.cpp (contents, props changed)
vendor/atf/dist/tools/requirements.cpp (contents, props changed)
vendor/atf/dist/tools/requirements.hpp
vendor/atf/dist/tools/requirements_test.cpp (contents, props changed)
vendor/atf/dist/tools/sample/
vendor/atf/dist/tools/sample/atf-run.hooks
vendor/atf/dist/tools/sample/common.conf (contents, props changed)
vendor/atf/dist/tools/several_tcs_helper.c (contents, props changed)
vendor/atf/dist/tools/share/
vendor/atf/dist/tools/share/atf-run.hooks
vendor/atf/dist/tools/signals.cpp (contents, props changed)
vendor/atf/dist/tools/signals.hpp
vendor/atf/dist/tools/signals_test.cpp (contents, props changed)
vendor/atf/dist/tools/test-program.cpp (contents, props changed)
vendor/atf/dist/tools/test-program.hpp
vendor/atf/dist/tools/test_helpers.hpp
vendor/atf/dist/tools/test_program_test.cpp (contents, props changed)
vendor/atf/dist/tools/tests-results.css (contents, props changed)
vendor/atf/dist/tools/tests-results.dtd
vendor/atf/dist/tools/tests-results.xsl (contents, props changed)
vendor/atf/dist/tools/text.cpp (contents, props changed)
vendor/atf/dist/tools/text.hpp
vendor/atf/dist/tools/text_test.cpp (contents, props changed)
vendor/atf/dist/tools/timers.cpp (contents, props changed)
vendor/atf/dist/tools/timers.hpp
vendor/atf/dist/tools/ui.cpp (contents, props changed)
vendor/atf/dist/tools/ui.hpp
vendor/atf/dist/tools/ui_test.cpp (contents, props changed)
vendor/atf/dist/tools/user.cpp (contents, props changed)
vendor/atf/dist/tools/user.hpp
vendor/atf/dist/tools/user_test.cpp (contents, props changed)
vendor/atf/dist/tools/zero_tcs_helper.c (contents, props changed)
Deleted:
vendor/atf/dist/atf-c++/detail/expand.cpp
vendor/atf/dist/atf-c++/detail/expand.hpp
vendor/atf/dist/atf-c++/detail/expand_test.cpp
vendor/atf/dist/atf-c++/detail/parser.cpp
vendor/atf/dist/atf-c++/detail/parser.hpp
vendor/atf/dist/atf-c++/detail/parser_test.cpp
vendor/atf/dist/atf-c++/detail/ui.cpp
vendor/atf/dist/atf-c++/detail/ui.hpp
vendor/atf/dist/atf-c++/detail/ui_test.cpp
vendor/atf/dist/atf-c++/noncopyable.hpp
vendor/atf/dist/atf-config/Atffile
vendor/atf/dist/atf-config/Kyuafile
vendor/atf/dist/atf-config/Makefile.am.inc
vendor/atf/dist/atf-config/atf-config.1
vendor/atf/dist/atf-config/atf-config.cpp
vendor/atf/dist/atf-config/integration_test.sh
vendor/atf/dist/atf-report/Atffile
vendor/atf/dist/atf-report/Kyuafile
vendor/atf/dist/atf-report/Makefile.am.inc
vendor/atf/dist/atf-report/atf-report.1
vendor/atf/dist/atf-report/atf-report.cpp
vendor/atf/dist/atf-report/fail_helper.cpp
vendor/atf/dist/atf-report/integration_test.sh
vendor/atf/dist/atf-report/misc_helpers.cpp
vendor/atf/dist/atf-report/pass_helper.cpp
vendor/atf/dist/atf-report/reader.cpp
vendor/atf/dist/atf-report/reader.hpp
vendor/atf/dist/atf-report/reader_test.cpp
vendor/atf/dist/atf-report/tests-results.css
vendor/atf/dist/atf-report/tests-results.dtd
vendor/atf/dist/atf-report/tests-results.xsl
vendor/atf/dist/atf-run/Atffile
vendor/atf/dist/atf-run/Kyuafile
vendor/atf/dist/atf-run/Makefile.am.inc
vendor/atf/dist/atf-run/atf-run.1
vendor/atf/dist/atf-run/atf-run.cpp
vendor/atf/dist/atf-run/atffile.cpp
vendor/atf/dist/atf-run/atffile.hpp
vendor/atf/dist/atf-run/atffile_test.cpp
vendor/atf/dist/atf-run/bad_metadata_helper.c
vendor/atf/dist/atf-run/config.cpp
vendor/atf/dist/atf-run/config.hpp
vendor/atf/dist/atf-run/config_test.cpp
vendor/atf/dist/atf-run/expect_helpers.c
vendor/atf/dist/atf-run/fs.cpp
vendor/atf/dist/atf-run/fs.hpp
vendor/atf/dist/atf-run/fs_test.cpp
vendor/atf/dist/atf-run/integration_test.sh
vendor/atf/dist/atf-run/io.cpp
vendor/atf/dist/atf-run/io.hpp
vendor/atf/dist/atf-run/io_test.cpp
vendor/atf/dist/atf-run/misc_helpers.cpp
vendor/atf/dist/atf-run/pass_helper.cpp
vendor/atf/dist/atf-run/requirements.cpp
vendor/atf/dist/atf-run/requirements.hpp
vendor/atf/dist/atf-run/requirements_test.cpp
vendor/atf/dist/atf-run/sample/atf-run.hooks
vendor/atf/dist/atf-run/sample/common.conf
vendor/atf/dist/atf-run/several_tcs_helper.c
vendor/atf/dist/atf-run/share/atf-run.hooks
vendor/atf/dist/atf-run/signals.cpp
vendor/atf/dist/atf-run/signals.hpp
vendor/atf/dist/atf-run/signals_test.cpp
vendor/atf/dist/atf-run/test-program.cpp
vendor/atf/dist/atf-run/test-program.hpp
vendor/atf/dist/atf-run/test_program_test.cpp
vendor/atf/dist/atf-run/timer.cpp
vendor/atf/dist/atf-run/timer.hpp
vendor/atf/dist/atf-run/user.cpp
vendor/atf/dist/atf-run/user.hpp
vendor/atf/dist/atf-run/user_test.cpp
vendor/atf/dist/atf-run/zero_tcs_helper.c
vendor/atf/dist/atf-version/Makefile.am.inc
vendor/atf/dist/atf-version/atf-version.1
vendor/atf/dist/atf-version/atf-version.cpp
vendor/atf/dist/atf-version/generate-revision.sh
vendor/atf/dist/doc/atf-formats.5
vendor/atf/dist/doc/atf.7.in
vendor/atf/dist/m4/module-sanity.m4
Modified:
vendor/atf/dist/Atffile
vendor/atf/dist/Kyuafile
vendor/atf/dist/Makefile.am
vendor/atf/dist/Makefile.in
vendor/atf/dist/NEWS
vendor/atf/dist/aclocal.m4
vendor/atf/dist/admin/check-style.sh
vendor/atf/dist/atf-c++/Makefile.am.inc
vendor/atf/dist/atf-c++/check.hpp
vendor/atf/dist/atf-c++/check_test.cpp
vendor/atf/dist/atf-c++/config.cpp
vendor/atf/dist/atf-c++/config_test.cpp
vendor/atf/dist/atf-c++/detail/Atffile
vendor/atf/dist/atf-c++/detail/Kyuafile
vendor/atf/dist/atf-c++/detail/Makefile.am.inc
vendor/atf/dist/atf-c++/detail/application.cpp
vendor/atf/dist/atf-c++/detail/application.hpp
vendor/atf/dist/atf-c++/detail/application_test.cpp
vendor/atf/dist/atf-c++/detail/exceptions.hpp
vendor/atf/dist/atf-c++/detail/process_test.cpp
vendor/atf/dist/atf-c++/detail/test_helpers.cpp
vendor/atf/dist/atf-c++/detail/test_helpers.hpp
vendor/atf/dist/atf-c++/macros_test.cpp
vendor/atf/dist/atf-c++/pkg_config_test.sh
vendor/atf/dist/atf-c++/tests.cpp
vendor/atf/dist/atf-c++/tests.hpp
vendor/atf/dist/atf-c++/tests_test.cpp
vendor/atf/dist/atf-c/Makefile.am.inc
vendor/atf/dist/atf-c/config.c
vendor/atf/dist/atf-c/config_test.c
vendor/atf/dist/atf-c/detail/Makefile.am.inc
vendor/atf/dist/atf-c/detail/test_helpers.c
vendor/atf/dist/atf-c/detail/test_helpers.h
vendor/atf/dist/atf-c/macros_test.c
vendor/atf/dist/atf-c/pkg_config_test.sh
vendor/atf/dist/atf-sh/atf-check.cpp
vendor/atf/dist/atf-sh/atf-sh.cpp
vendor/atf/dist/atf-sh/integration_test.sh
vendor/atf/dist/bconfig.h.in
vendor/atf/dist/bootstrap/Makefile.am.inc
vendor/atf/dist/bootstrap/h_app_empty.cpp
vendor/atf/dist/bootstrap/h_app_opts_args.cpp
vendor/atf/dist/bootstrap/package.m4
vendor/atf/dist/bootstrap/testsuite
vendor/atf/dist/bootstrap/testsuite.at
vendor/atf/dist/configure
vendor/atf/dist/configure.ac
vendor/atf/dist/doc/Makefile.am.inc
vendor/atf/dist/doc/atf-test-case.4
vendor/atf/dist/m4/cxx-std-funcs.m4
vendor/atf/dist/m4/module-env.m4
vendor/atf/dist/m4/module-fs.m4
Modified: vendor/atf/dist/Atffile
==============================================================================
--- vendor/atf/dist/Atffile Fri Feb 14 12:01:52 2014 (r261885)
+++ vendor/atf/dist/Atffile Fri Feb 14 14:41:25 2014 (r261886)
@@ -7,6 +7,4 @@ tp: atf-c++
tp: atf-sh
tp: test-programs
-tp-glob: atf-config*
-tp-glob: atf-report*
-tp-glob: atf-run*
+tp-glob: tools*
Modified: vendor/atf/dist/Kyuafile
==============================================================================
--- vendor/atf/dist/Kyuafile Fri Feb 14 12:01:52 2014 (r261885)
+++ vendor/atf/dist/Kyuafile Fri Feb 14 14:41:25 2014 (r261886)
@@ -7,12 +7,6 @@ include("atf-c++/Kyuafile")
include("atf-sh/Kyuafile")
include("test-programs/Kyuafile")
-if fs.exists("atf-config/Kyuafile") then
- include("atf-config/Kyuafile")
-end
-if fs.exists("atf-report/Kyuafile") then
- include("atf-report/Kyuafile")
-end
-if fs.exists("atf-run/Kyuafile") then
- include("atf-run/Kyuafile")
+if fs.exists("tools/Kyuafile") then
+ include("tools/Kyuafile")
end
Modified: vendor/atf/dist/Makefile.am
==============================================================================
--- vendor/atf/dist/Makefile.am Fri Feb 14 12:01:52 2014 (r261885)
+++ vendor/atf/dist/Makefile.am Fri Feb 14 14:41:25 2014 (r261886)
@@ -30,6 +30,7 @@
atf_aclocal_DATA =
BUILT_SOURCES =
CLEANFILES =
+DIST_HOOKS =
EXTRA_DIST =
bin_PROGRAMS =
dist_man_MANS =
@@ -54,10 +55,7 @@ include doc/Makefile.am.inc
include test-programs/Makefile.am.inc
if ENABLE_TOOLS
-include atf-report/Makefile.am.inc
-include atf-config/Makefile.am.inc
-include atf-run/Makefile.am.inc
-include atf-version/Makefile.am.inc
+include tools/Makefile.am.inc
endif
#
@@ -126,7 +124,7 @@ BUILD_SH_TP = \
# Custom targets.
#
-dist-hook: forbid-dist
+DIST_HOOKS += forbid-dist
if ENABLE_TOOLS
forbid-dist:
@true
@@ -151,4 +149,6 @@ release-test:
.PHONY: $(PHONY_TARGETS)
+dist-hook: $(DIST_HOOKS)
+
# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
Modified: vendor/atf/dist/Makefile.in
==============================================================================
--- vendor/atf/dist/Makefile.in Fri Feb 14 12:01:52 2014 (r261885)
+++ vendor/atf/dist/Makefile.in Fri Feb 14 14:41:25 2014 (r261886)
@@ -333,92 +333,6 @@
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-#
-# Automated Testing Framework (atf)
-#
-# Copyright (c) 2007 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# Copyright (c) 2007 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# Copyright (c) 2007 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
@@ -500,17 +414,15 @@ DIST_COMMON = $(srcdir)/admin/Makefile.a
$(srcdir)/bootstrap/Makefile.am.inc \
$(srcdir)/doc/Makefile.am.inc \
$(srcdir)/test-programs/Makefile.am.inc \
- $(srcdir)/atf-report/Makefile.am.inc \
- $(srcdir)/atf-config/Makefile.am.inc \
- $(srcdir)/atf-run/Makefile.am.inc \
- $(srcdir)/atf-version/Makefile.am.inc $(srcdir)/Makefile.in \
+ $(srcdir)/tools/Makefile.am.inc $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/bconfig.h.in \
- $(top_srcdir)/atf-c/defs.h.in $(top_srcdir)/admin/depcomp \
- $(dist_man_MANS) $(atf_c_HEADERS) $(atf_c___HEADERS) \
- $(include_HEADERS) AUTHORS COPYING INSTALL NEWS README \
- admin/compile admin/config.guess admin/config.sub \
- admin/depcomp admin/install-sh admin/missing admin/ltmain.sh \
+ $(top_srcdir)/atf-c/defs.h.in $(top_srcdir)/tools/defs.hpp.in \
+ $(top_srcdir)/admin/depcomp $(dist_man_MANS) $(atf_c_HEADERS) \
+ $(atf_c___HEADERS) $(include_HEADERS) AUTHORS COPYING INSTALL \
+ NEWS README admin/ar-lib admin/compile admin/config.guess \
+ admin/config.sub admin/depcomp admin/install-sh admin/missing \
+ admin/ltmain.sh $(top_srcdir)/admin/ar-lib \
$(top_srcdir)/admin/compile $(top_srcdir)/admin/config.guess \
$(top_srcdir)/admin/config.sub $(top_srcdir)/admin/install-sh \
$(top_srcdir)/admin/ltmain.sh $(top_srcdir)/admin/missing
@@ -526,7 +438,8 @@ tests_atf_c_detail_PROGRAMS = atf-c/deta
atf-c/detail/process_test$(EXEEXT) \
atf-c/detail/sanity_test$(EXEEXT) \
atf-c/detail/text_test$(EXEEXT) \
- atf-c/detail/user_test$(EXEEXT)
+ atf-c/detail/user_test$(EXEEXT) \
+ atf-c/detail/version_helper$(EXEEXT)
tests_atf_c___PROGRAMS = atf-c++/atf_c++_test$(EXEEXT) \
atf-c++/build_test$(EXEEXT) atf-c++/check_test$(EXEEXT) \
atf-c++/config_test$(EXEEXT) atf-c++/macros_test$(EXEEXT) \
@@ -536,69 +449,72 @@ tests_atf_c___detail_PROGRAMS = \
atf-c++/detail/auto_array_test$(EXEEXT) \
atf-c++/detail/env_test$(EXEEXT) \
atf-c++/detail/exceptions_test$(EXEEXT) \
- atf-c++/detail/expand_test$(EXEEXT) \
atf-c++/detail/fs_test$(EXEEXT) \
- atf-c++/detail/parser_test$(EXEEXT) \
atf-c++/detail/process_test$(EXEEXT) \
atf-c++/detail/sanity_test$(EXEEXT) \
atf-c++/detail/text_test$(EXEEXT) \
- atf-c++/detail/ui_test$(EXEEXT)
+ atf-c++/detail/version_helper$(EXEEXT)
check_PROGRAMS = bootstrap/h_app_empty$(EXEEXT) \
bootstrap/h_app_opts_args$(EXEEXT) \
bootstrap/h_tp_basic_c$(EXEEXT) \
bootstrap/h_tp_basic_cpp$(EXEEXT)
- at ENABLE_TOOLS_TRUE@am__append_1 = doc/atf.7
- at ENABLE_TOOLS_TRUE@am__append_2 = doc/atf.7
- at ENABLE_TOOLS_TRUE@am__append_3 = doc/atf.7.in
- at ENABLE_TOOLS_TRUE@am__append_4 = doc/atf-formats.5 \
- at ENABLE_TOOLS_TRUE@ atf-report/atf-report.1 \
- at ENABLE_TOOLS_TRUE@ atf-config/atf-config.1 atf-run/atf-run.1 \
- at ENABLE_TOOLS_TRUE@ atf-version/atf-version.1
tests_test_programs_PROGRAMS = test-programs/c_helpers$(EXEEXT) \
test-programs/cpp_helpers$(EXEEXT)
- at ENABLE_TOOLS_TRUE@am__append_5 = atf-report/atf-report \
- at ENABLE_TOOLS_TRUE@ atf-config/atf-config atf-run/atf-run \
- at ENABLE_TOOLS_TRUE@ atf-version/atf-version
- at ENABLE_TOOLS_TRUE@am__append_6 = $(css_DATA) $(dtd_DATA) $(xsl_DATA) \
- at ENABLE_TOOLS_TRUE@ $(tests_atf_report_DATA) \
- at ENABLE_TOOLS_TRUE@ atf-report/integration_test.sh \
- at ENABLE_TOOLS_TRUE@ $(tests_atf_config_DATA) \
- at ENABLE_TOOLS_TRUE@ atf-config/integration_test.sh \
- at ENABLE_TOOLS_TRUE@ $(tests_atf_run_DATA) \
- at ENABLE_TOOLS_TRUE@ atf-run/integration_test.sh $(hooks_DATA) \
- at ENABLE_TOOLS_TRUE@ $(eg_DATA) atf-version/generate-revision.sh
- at ENABLE_TOOLS_TRUE@tests_atf_report_PROGRAMS = \
- at ENABLE_TOOLS_TRUE@ atf-report/fail_helper$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-report/misc_helpers$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-report/pass_helper$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-report/reader_test$(EXEEXT)
- at ENABLE_TOOLS_TRUE@am__append_7 = atf-report/integration_test \
- at ENABLE_TOOLS_TRUE@ atf-config/integration_test \
- at ENABLE_TOOLS_TRUE@ atf-run/integration_test \
- at ENABLE_TOOLS_TRUE@ atf-version/revision.h \
- at ENABLE_TOOLS_TRUE@ atf-version/revision.h.stamp \
- at ENABLE_TOOLS_TRUE@ installcheck.fifo installcheck.log
- at ENABLE_TOOLS_TRUE@tests_atf_run_PROGRAMS = \
- at ENABLE_TOOLS_TRUE@ atf-run/atffile_test$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/bad_metadata_helper$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/config_test$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/expect_helpers$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/fs_test$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/io_test$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/misc_helpers$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/pass_helper$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/several_tcs_helper$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/requirements_test$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/signals_test$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/test_program_test$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/user_test$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/zero_tcs_helper$(EXEEXT)
- at ENABLE_TOOLS_TRUE@am__append_8 = atf-version/revision.h
- at ENABLE_TOOLS_TRUE@am__append_9 = atf-version/revision.h.stamp \
+
+# XXX For some reason, the nodist line above does not work as expected.
+# Work this problem around.
+ at ENABLE_TOOLS_TRUE@am__append_1 = kill-defs-hpp
+ at ENABLE_TOOLS_TRUE@am__append_2 = tools/atf-config tools/atf-report \
+ at ENABLE_TOOLS_TRUE@ tools/atf-run tools/atf-version
+ at ENABLE_TOOLS_TRUE@am__append_3 = tools/atf-config.1 \
+ at ENABLE_TOOLS_TRUE@ tools/atf-report.1 tools/atf-run.1 \
+ at ENABLE_TOOLS_TRUE@ tools/atf-version.1 tools/atf-formats.5
+ at ENABLE_TOOLS_TRUE@am__append_4 = tools/generate-revision.sh \
+ at ENABLE_TOOLS_TRUE@ tools/atf.7.in $(css_DATA) $(dtd_DATA) \
+ at ENABLE_TOOLS_TRUE@ $(eg_DATA) $(hooks_DATA) $(xsl_DATA) \
+ at ENABLE_TOOLS_TRUE@ $(tests_tools_DATA) \
+ at ENABLE_TOOLS_TRUE@ tools/atf-config_test.sh \
+ at ENABLE_TOOLS_TRUE@ tools/atf-report_test.sh \
+ at ENABLE_TOOLS_TRUE@ tools/atf-run_test.sh
+ at ENABLE_TOOLS_TRUE@am__append_5 = tools/revision.h
+ at ENABLE_TOOLS_TRUE@am__append_6 = tools/revision.h \
+ at ENABLE_TOOLS_TRUE@ tools/revision.h.stamp tools/atf.7 \
+ at ENABLE_TOOLS_TRUE@ tools/atf-config_test tools/atf-report_test \
+ at ENABLE_TOOLS_TRUE@ tools/atf-run_test installcheck.fifo \
+ at ENABLE_TOOLS_TRUE@ installcheck.log
+ at ENABLE_TOOLS_TRUE@am__append_7 = tools/revision.h.stamp \
@ENABLE_TOOLS_TRUE@ installcheck-atf
- at ENABLE_TOOLS_TRUE@am__append_10 = installcheck-atf
- at ENABLE_TOOLS_FALSE@@HAVE_KYUA_TRUE at am__append_11 = installcheck-kyua
- at ENABLE_TOOLS_TRUE@am__append_12 = Atffile
+ at ENABLE_TOOLS_TRUE@am__append_8 = tools/atf.7
+ at ENABLE_TOOLS_TRUE@tests_tools_PROGRAMS = \
+ at ENABLE_TOOLS_TRUE@ tools/application_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/atffile_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/auto_array_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/bad_metadata_helper$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/config_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/config_file_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/env_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/expand_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/expect_helpers$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/fail_helper$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/fs_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/io_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/misc_helpers$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/parser_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/process_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/pass_helper$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/process_helpers$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/reader_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/requirements_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/several_tcs_helper$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/signals_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/test_program_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/text_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/ui_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/user_test$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/zero_tcs_helper$(EXEEXT)
+ at ENABLE_TOOLS_TRUE@am__append_9 = installcheck-atf
+ at ENABLE_TOOLS_FALSE@@HAVE_KYUA_TRUE at am__append_10 = installcheck-kyua
+ at ENABLE_TOOLS_TRUE@am__append_11 = Atffile
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler-flags.m4 \
@@ -609,7 +525,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/c
$(top_srcdir)/m4/module-application.m4 \
$(top_srcdir)/m4/module-defs.m4 $(top_srcdir)/m4/module-env.m4 \
$(top_srcdir)/m4/module-fs.m4 \
- $(top_srcdir)/m4/module-sanity.m4 \
$(top_srcdir)/m4/module-signals.m4 \
$(top_srcdir)/m4/runtime-tool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -618,8 +533,52 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = bconfig.h
-CONFIG_CLEAN_FILES = atf-c/defs.h
+CONFIG_CLEAN_FILES = atf-c/defs.h tools/defs.hpp
CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_ at AM_V@)
+am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
+am__v_AR_0 = @echo " AR " $@;
+am__v_AR_1 =
+tools_libtools_a_AR = $(AR) $(ARFLAGS)
+tools_libtools_a_LIBADD =
+am__tools_libtools_a_SOURCES_DIST = tools/application.cpp \
+ tools/application.hpp tools/atffile.cpp tools/atffile.hpp \
+ tools/auto_array.hpp tools/config.cpp tools/config.hpp \
+ tools/config_file.cpp tools/config_file.hpp tools/env.cpp \
+ tools/env.hpp tools/exceptions.cpp tools/exceptions.hpp \
+ tools/expand.cpp tools/expand.hpp tools/fs.cpp tools/fs.hpp \
+ tools/io.cpp tools/io.hpp tools/parser.cpp tools/parser.hpp \
+ tools/process.cpp tools/process.hpp tools/reader.cpp \
+ tools/reader.hpp tools/requirements.cpp tools/requirements.hpp \
+ tools/signals.cpp tools/signals.hpp tools/test-program.cpp \
+ tools/test-program.hpp tools/test_helpers.hpp tools/text.cpp \
+ tools/text.hpp tools/timers.cpp tools/timers.hpp tools/ui.cpp \
+ tools/ui.hpp tools/user.cpp tools/user.hpp
+am__dirstamp = $(am__leading_dot)dirstamp
+ at ENABLE_TOOLS_TRUE@am_tools_libtools_a_OBJECTS = tools/tools_libtools_a-application.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-atffile.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-config.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-config_file.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-env.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-exceptions.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-expand.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-fs.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-io.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-parser.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-process.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-reader.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-requirements.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-signals.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-test-program.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-text.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-timers.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-ui.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-user.$(OBJEXT)
+nodist_tools_libtools_a_OBJECTS =
+tools_libtools_a_OBJECTS = $(am_tools_libtools_a_OBJECTS) \
+ $(nodist_tools_libtools_a_OBJECTS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -652,14 +611,11 @@ am__installdirs = "$(DESTDIR)$(libdir)"
"$(DESTDIR)$(tests_atf_c__dir)" \
"$(DESTDIR)$(tests_atf_c___detaildir)" \
"$(DESTDIR)$(tests_atf_c_detaildir)" \
- "$(DESTDIR)$(tests_atf_reportdir)" \
- "$(DESTDIR)$(tests_atf_rundir)" \
"$(DESTDIR)$(tests_test_programsdir)" \
- "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" \
- "$(DESTDIR)$(tests_atf_configdir)" \
- "$(DESTDIR)$(tests_atf_reportdir)" \
- "$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_atf_shdir)" \
- "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" \
+ "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(tests_atf_cdir)" \
+ "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_shdir)" \
+ "$(DESTDIR)$(tests_test_programsdir)" \
+ "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" \
"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" \
"$(DESTDIR)$(atf_aclocaldir)" \
@@ -672,15 +628,13 @@ am__installdirs = "$(DESTDIR)$(libdir)"
"$(DESTDIR)$(tests_atf_c__dir)" \
"$(DESTDIR)$(tests_atf_c___detaildir)" \
"$(DESTDIR)$(tests_atf_c_detaildir)" \
- "$(DESTDIR)$(tests_atf_configdir)" \
- "$(DESTDIR)$(tests_atf_reportdir)" \
- "$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_atf_shdir)" \
- "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(xsldir)" \
+ "$(DESTDIR)$(tests_atf_shdir)" \
+ "$(DESTDIR)$(tests_test_programsdir)" \
+ "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(xsldir)" \
"$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" \
"$(DESTDIR)$(includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
atf_c___detail_libtest_helpers_la_LIBADD =
-am__dirstamp = $(am__leading_dot)dirstamp
am_atf_c___detail_libtest_helpers_la_OBJECTS = \
atf-c++/detail/test_helpers.lo
atf_c___detail_libtest_helpers_la_OBJECTS = \
@@ -698,10 +652,8 @@ libatf_c___la_DEPENDENCIES = libatf-c.la
am_libatf_c___la_OBJECTS = atf-c++/build.lo atf-c++/check.lo \
atf-c++/config.lo atf-c++/tests.lo atf-c++/utils.lo \
atf-c++/detail/application.lo atf-c++/detail/env.lo \
- atf-c++/detail/exceptions.lo atf-c++/detail/expand.lo \
- atf-c++/detail/fs.lo atf-c++/detail/parser.lo \
- atf-c++/detail/process.lo atf-c++/detail/text.lo \
- atf-c++/detail/ui.lo
+ atf-c++/detail/exceptions.lo atf-c++/detail/fs.lo \
+ atf-c++/detail/process.lo atf-c++/detail/text.lo
libatf_c___la_OBJECTS = $(am_libatf_c___la_OBJECTS)
libatf_c___la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -727,14 +679,14 @@ libatf_c_la_OBJECTS = $(am_libatf_c_la_O
libatf_c_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libatf_c_la_LDFLAGS) $(LDFLAGS) -o $@
- at ENABLE_TOOLS_TRUE@am__EXEEXT_1 = atf-report/atf-report$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-config/atf-config$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf-run$(EXEEXT) \
- at ENABLE_TOOLS_TRUE@ atf-version/atf-version$(EXEEXT)
+ at ENABLE_TOOLS_TRUE@am__EXEEXT_1 = tools/atf-config$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/atf-report$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/atf-run$(EXEEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/atf-version$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(tests_atf_c_PROGRAMS) \
$(tests_atf_c___PROGRAMS) $(tests_atf_c___detail_PROGRAMS) \
- $(tests_atf_c_detail_PROGRAMS) $(tests_atf_report_PROGRAMS) \
- $(tests_atf_run_PROGRAMS) $(tests_test_programs_PROGRAMS)
+ $(tests_atf_c_detail_PROGRAMS) $(tests_test_programs_PROGRAMS) \
+ $(tests_tools_PROGRAMS)
am_atf_c___atf_c___test_OBJECTS = atf-c++/atf_c++_test.$(OBJEXT)
atf_c___atf_c___test_OBJECTS = $(am_atf_c___atf_c___test_OBJECTS)
atf_c___atf_c___test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \
@@ -775,22 +727,10 @@ atf_c___detail_exceptions_test_OBJECTS =
$(am_atf_c___detail_exceptions_test_OBJECTS)
atf_c___detail_exceptions_test_DEPENDENCIES = \
atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_expand_test_OBJECTS = \
- atf-c++/detail/expand_test.$(OBJEXT)
-atf_c___detail_expand_test_OBJECTS = \
- $(am_atf_c___detail_expand_test_OBJECTS)
-atf_c___detail_expand_test_DEPENDENCIES = \
- atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
am_atf_c___detail_fs_test_OBJECTS = atf-c++/detail/fs_test.$(OBJEXT)
atf_c___detail_fs_test_OBJECTS = $(am_atf_c___detail_fs_test_OBJECTS)
atf_c___detail_fs_test_DEPENDENCIES = \
atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_parser_test_OBJECTS = \
- atf-c++/detail/parser_test.$(OBJEXT)
-atf_c___detail_parser_test_OBJECTS = \
- $(am_atf_c___detail_parser_test_OBJECTS)
-atf_c___detail_parser_test_DEPENDENCIES = \
- atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
am_atf_c___detail_process_test_OBJECTS = \
atf-c++/detail/process_test.$(OBJEXT)
atf_c___detail_process_test_OBJECTS = \
@@ -809,10 +749,11 @@ atf_c___detail_text_test_OBJECTS = \
$(am_atf_c___detail_text_test_OBJECTS)
atf_c___detail_text_test_DEPENDENCIES = \
atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_ui_test_OBJECTS = atf-c++/detail/ui_test.$(OBJEXT)
-atf_c___detail_ui_test_OBJECTS = $(am_atf_c___detail_ui_test_OBJECTS)
-atf_c___detail_ui_test_DEPENDENCIES = \
- atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
+am_atf_c___detail_version_helper_OBJECTS = \
+ atf-c++/detail/version_helper.$(OBJEXT)
+atf_c___detail_version_helper_OBJECTS = \
+ $(am_atf_c___detail_version_helper_OBJECTS)
+atf_c___detail_version_helper_LDADD = $(LDADD)
am_atf_c___macros_test_OBJECTS = atf-c++/macros_test.$(OBJEXT)
atf_c___macros_test_OBJECTS = $(am_atf_c___macros_test_OBJECTS)
atf_c___macros_test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \
@@ -888,6 +829,11 @@ am_atf_c_detail_user_test_OBJECTS = atf-
atf_c_detail_user_test_OBJECTS = $(am_atf_c_detail_user_test_OBJECTS)
atf_c_detail_user_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
libatf-c.la
+am_atf_c_detail_version_helper_OBJECTS = \
+ atf-c/detail/version_helper.$(OBJEXT)
+atf_c_detail_version_helper_OBJECTS = \
+ $(am_atf_c_detail_version_helper_OBJECTS)
+atf_c_detail_version_helper_LDADD = $(LDADD)
am_atf_c_error_test_OBJECTS = atf-c/error_test.$(OBJEXT)
atf_c_error_test_OBJECTS = $(am_atf_c_error_test_OBJECTS)
atf_c_error_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
@@ -908,206 +854,21 @@ am_atf_c_utils_test_OBJECTS = atf-c/util
atf_c_utils_test_OBJECTS = $(am_atf_c_utils_test_OBJECTS)
atf_c_utils_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
libatf-c.la
-am__atf_config_atf_config_SOURCES_DIST = atf-config/atf-config.cpp
- at ENABLE_TOOLS_TRUE@am_atf_config_atf_config_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-config/atf-config.$(OBJEXT)
-atf_config_atf_config_OBJECTS = $(am_atf_config_atf_config_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_config_atf_config_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_report_atf_report_SOURCES_DIST = atf-report/atf-report.cpp \
- atf-report/reader.cpp atf-report/reader.hpp
- at ENABLE_TOOLS_TRUE@am_atf_report_atf_report_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-report/atf-report.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-report/reader.$(OBJEXT)
-atf_report_atf_report_OBJECTS = $(am_atf_report_atf_report_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_report_atf_report_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_report_fail_helper_SOURCES_DIST = atf-report/fail_helper.cpp
- at ENABLE_TOOLS_TRUE@am_atf_report_fail_helper_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-report/fail_helper.$(OBJEXT)
-atf_report_fail_helper_OBJECTS = $(am_atf_report_fail_helper_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_report_fail_helper_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_report_misc_helpers_SOURCES_DIST = \
- atf-report/misc_helpers.cpp
- at ENABLE_TOOLS_TRUE@am_atf_report_misc_helpers_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-report/misc_helpers.$(OBJEXT)
-atf_report_misc_helpers_OBJECTS = \
- $(am_atf_report_misc_helpers_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_report_misc_helpers_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_report_pass_helper_SOURCES_DIST = atf-report/pass_helper.cpp
- at ENABLE_TOOLS_TRUE@am_atf_report_pass_helper_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-report/pass_helper.$(OBJEXT)
-atf_report_pass_helper_OBJECTS = $(am_atf_report_pass_helper_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_report_pass_helper_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_report_reader_test_SOURCES_DIST = atf-report/reader_test.cpp \
- atf-report/reader.cpp
- at ENABLE_TOOLS_TRUE@am_atf_report_reader_test_OBJECTS = atf-report/atf_report_reader_test-reader_test.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-report/atf_report_reader_test-reader.$(OBJEXT)
-atf_report_reader_test_OBJECTS = $(am_atf_report_reader_test_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_report_reader_test_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_run_atf_run_SOURCES_DIST = atf-run/atf-run.cpp \
- atf-run/atffile.cpp atf-run/atffile.hpp atf-run/config.cpp \
- atf-run/config.hpp atf-run/fs.cpp atf-run/fs.hpp \
- atf-run/io.cpp atf-run/io.hpp atf-run/requirements.cpp \
- atf-run/requirements.hpp atf-run/signals.cpp \
- atf-run/signals.hpp atf-run/test-program.cpp \
- atf-run/test-program.hpp atf-run/timer.cpp atf-run/timer.hpp \
- atf-run/user.cpp atf-run/user.hpp
- at ENABLE_TOOLS_TRUE@am_atf_run_atf_run_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-atf-run.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-atffile.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-config.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-fs.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-io.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-requirements.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-signals.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-test-program.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-timer.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-user.$(OBJEXT)
-atf_run_atf_run_OBJECTS = $(am_atf_run_atf_run_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_atf_run_DEPENDENCIES = $(ATF_CXX_LIBS)
-am__atf_run_atffile_test_SOURCES_DIST = atf-run/atffile_test.cpp \
- atf-run/atffile.cpp
- at ENABLE_TOOLS_TRUE@am_atf_run_atffile_test_OBJECTS = atf-run/atf_run_atffile_test-atffile_test.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_atffile_test-atffile.$(OBJEXT)
-atf_run_atffile_test_OBJECTS = $(am_atf_run_atffile_test_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_atffile_test_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_run_bad_metadata_helper_SOURCES_DIST = \
- atf-run/bad_metadata_helper.c
- at ENABLE_TOOLS_TRUE@am_atf_run_bad_metadata_helper_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/bad_metadata_helper.$(OBJEXT)
-atf_run_bad_metadata_helper_OBJECTS = \
- $(am_atf_run_bad_metadata_helper_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_bad_metadata_helper_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ libatf-c.la
-am__atf_run_config_test_SOURCES_DIST = atf-run/config_test.cpp \
- atf-run/config.cpp
- at ENABLE_TOOLS_TRUE@am_atf_run_config_test_OBJECTS = atf-run/atf_run_config_test-config_test.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_config_test-config.$(OBJEXT)
-atf_run_config_test_OBJECTS = $(am_atf_run_config_test_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_config_test_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_run_expect_helpers_SOURCES_DIST = atf-run/expect_helpers.c
- at ENABLE_TOOLS_TRUE@am_atf_run_expect_helpers_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/expect_helpers.$(OBJEXT)
-atf_run_expect_helpers_OBJECTS = $(am_atf_run_expect_helpers_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_expect_helpers_DEPENDENCIES = libatf-c.la
-am__atf_run_fs_test_SOURCES_DIST = atf-run/fs_test.cpp atf-run/fs.cpp \
- atf-run/user.cpp
- at ENABLE_TOOLS_TRUE@am_atf_run_fs_test_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/fs_test.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/fs.$(OBJEXT) atf-run/user.$(OBJEXT)
-atf_run_fs_test_OBJECTS = $(am_atf_run_fs_test_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_fs_test_DEPENDENCIES = $(ATF_CXX_LIBS)
-am__atf_run_io_test_SOURCES_DIST = atf-run/io_test.cpp atf-run/io.cpp \
- atf-run/signals.cpp
- at ENABLE_TOOLS_TRUE@am_atf_run_io_test_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/io_test.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/io.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/signals.$(OBJEXT)
-atf_run_io_test_OBJECTS = $(am_atf_run_io_test_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_io_test_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_run_misc_helpers_SOURCES_DIST = atf-run/misc_helpers.cpp
- at ENABLE_TOOLS_TRUE@am_atf_run_misc_helpers_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/misc_helpers.$(OBJEXT)
-atf_run_misc_helpers_OBJECTS = $(am_atf_run_misc_helpers_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_misc_helpers_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_run_pass_helper_SOURCES_DIST = atf-run/pass_helper.cpp
- at ENABLE_TOOLS_TRUE@am_atf_run_pass_helper_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/pass_helper.$(OBJEXT)
-atf_run_pass_helper_OBJECTS = $(am_atf_run_pass_helper_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_pass_helper_DEPENDENCIES = $(ATF_CXX_LIBS)
-am__atf_run_requirements_test_SOURCES_DIST = \
- atf-run/requirements_test.cpp atf-run/requirements.cpp \
- atf-run/user.cpp
- at ENABLE_TOOLS_TRUE@am_atf_run_requirements_test_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/requirements_test.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/requirements.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/user.$(OBJEXT)
-atf_run_requirements_test_OBJECTS = \
- $(am_atf_run_requirements_test_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_requirements_test_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_run_several_tcs_helper_SOURCES_DIST = \
- atf-run/several_tcs_helper.c
- at ENABLE_TOOLS_TRUE@am_atf_run_several_tcs_helper_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/several_tcs_helper.$(OBJEXT)
-atf_run_several_tcs_helper_OBJECTS = \
- $(am_atf_run_several_tcs_helper_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_several_tcs_helper_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ libatf-c.la
-am__atf_run_signals_test_SOURCES_DIST = atf-run/signals_test.cpp \
- atf-run/signals.cpp
- at ENABLE_TOOLS_TRUE@am_atf_run_signals_test_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/signals_test.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/signals.$(OBJEXT)
-atf_run_signals_test_OBJECTS = $(am_atf_run_signals_test_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_signals_test_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_run_test_program_test_SOURCES_DIST = \
- atf-run/test_program_test.cpp atf-run/fs.cpp atf-run/io.cpp \
- atf-run/requirements.cpp atf-run/signals.cpp \
- atf-run/test-program.cpp atf-run/timer.cpp atf-run/user.cpp
- at ENABLE_TOOLS_TRUE@am_atf_run_test_program_test_OBJECTS = atf-run/atf_run_test_program_test-test_program_test.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-fs.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-io.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-requirements.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-signals.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-test-program.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-timer.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-user.$(OBJEXT)
-atf_run_test_program_test_OBJECTS = \
- $(am_atf_run_test_program_test_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_test_program_test_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
-am__atf_run_user_test_SOURCES_DIST = atf-run/user_test.cpp \
- atf-run/user.cpp
- at ENABLE_TOOLS_TRUE@am_atf_run_user_test_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/user_test.$(OBJEXT) \
- at ENABLE_TOOLS_TRUE@ atf-run/user.$(OBJEXT)
-atf_run_user_test_OBJECTS = $(am_atf_run_user_test_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_user_test_DEPENDENCIES = $(ATF_CXX_LIBS)
-am__atf_run_zero_tcs_helper_SOURCES_DIST = atf-run/zero_tcs_helper.c
- at ENABLE_TOOLS_TRUE@am_atf_run_zero_tcs_helper_OBJECTS = \
- at ENABLE_TOOLS_TRUE@ atf-run/zero_tcs_helper.$(OBJEXT)
-atf_run_zero_tcs_helper_OBJECTS = \
- $(am_atf_run_zero_tcs_helper_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_run_zero_tcs_helper_DEPENDENCIES = libatf-c.la
am_atf_sh_atf_check_OBJECTS = atf-sh/atf-check.$(OBJEXT)
atf_sh_atf_check_OBJECTS = $(am_atf_sh_atf_check_OBJECTS)
atf_sh_atf_check_DEPENDENCIES = $(ATF_CXX_LIBS)
am_atf_sh_atf_sh_OBJECTS = atf-sh/atf-sh.$(OBJEXT)
atf_sh_atf_sh_OBJECTS = $(am_atf_sh_atf_sh_OBJECTS)
atf_sh_atf_sh_DEPENDENCIES = $(ATF_CXX_LIBS)
-am__atf_version_atf_version_SOURCES_DIST = \
- atf-version/atf-version.cpp
- at ENABLE_TOOLS_TRUE@am_atf_version_atf_version_OBJECTS = atf-version/atf_version_atf_version-atf-version.$(OBJEXT)
-nodist_atf_version_atf_version_OBJECTS =
-atf_version_atf_version_OBJECTS = \
- $(am_atf_version_atf_version_OBJECTS) \
- $(nodist_atf_version_atf_version_OBJECTS)
- at ENABLE_TOOLS_TRUE@atf_version_atf_version_DEPENDENCIES = \
- at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
am_bootstrap_h_app_empty_OBJECTS = bootstrap/h_app_empty.$(OBJEXT)
bootstrap_h_app_empty_OBJECTS = $(am_bootstrap_h_app_empty_OBJECTS)
-bootstrap_h_app_empty_DEPENDENCIES = $(ATF_CXX_LIBS)
+bootstrap_h_app_empty_DEPENDENCIES = tools/libtools.a $(ATF_CXX_LIBS)
am_bootstrap_h_app_opts_args_OBJECTS = \
bootstrap/h_app_opts_args.$(OBJEXT)
bootstrap_h_app_opts_args_OBJECTS = \
$(am_bootstrap_h_app_opts_args_OBJECTS)
-bootstrap_h_app_opts_args_DEPENDENCIES = $(ATF_CXX_LIBS)
+bootstrap_h_app_opts_args_DEPENDENCIES = tools/libtools.a \
+ $(ATF_CXX_LIBS)
am_bootstrap_h_tp_basic_c_OBJECTS = bootstrap/h_tp_basic_c.$(OBJEXT)
bootstrap_h_tp_basic_c_OBJECTS = $(am_bootstrap_h_tp_basic_c_OBJECTS)
bootstrap_h_tp_basic_c_DEPENDENCIES = libatf-c.la
@@ -1126,10 +887,179 @@ am_test_programs_cpp_helpers_OBJECTS =
test_programs_cpp_helpers_OBJECTS = \
$(am_test_programs_cpp_helpers_OBJECTS)
test_programs_cpp_helpers_DEPENDENCIES = $(ATF_CXX_LIBS)
+am__tools_application_test_SOURCES_DIST = tools/application_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_application_test_OBJECTS = tools/tools_application_test-application_test.$(OBJEXT)
+tools_application_test_OBJECTS = $(am_tools_application_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_application_test_DEPENDENCIES = \
+ at ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS)
+am__tools_atf_config_SOURCES_DIST = tools/atf-config.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_atf_config_OBJECTS = tools/tools_atf_config-atf-config.$(OBJEXT)
+tools_atf_config_OBJECTS = $(am_tools_atf_config_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_atf_config_DEPENDENCIES = $(TOOLS_LDADD)
+am__tools_atf_report_SOURCES_DIST = tools/atf-report.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_atf_report_OBJECTS = tools/tools_atf_report-atf-report.$(OBJEXT)
+tools_atf_report_OBJECTS = $(am_tools_atf_report_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_atf_report_DEPENDENCIES = $(TOOLS_LDADD)
+am__tools_atf_run_SOURCES_DIST = tools/atf-run.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_atf_run_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/tools_atf_run-atf-run.$(OBJEXT)
+tools_atf_run_OBJECTS = $(am_tools_atf_run_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_atf_run_DEPENDENCIES = $(TOOLS_LDADD)
+am__tools_atf_version_SOURCES_DIST = tools/atf-version.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_atf_version_OBJECTS = tools/tools_atf_version-atf-version.$(OBJEXT)
+nodist_tools_atf_version_OBJECTS =
+tools_atf_version_OBJECTS = $(am_tools_atf_version_OBJECTS) \
+ $(nodist_tools_atf_version_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_atf_version_DEPENDENCIES = $(TOOLS_LDADD)
+am__tools_atffile_test_SOURCES_DIST = tools/atffile_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_atffile_test_OBJECTS = tools/tools_atffile_test-atffile_test.$(OBJEXT)
+tools_atffile_test_OBJECTS = $(am_tools_atffile_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_atffile_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_auto_array_test_SOURCES_DIST = tools/auto_array_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_auto_array_test_OBJECTS = tools/tools_auto_array_test-auto_array_test.$(OBJEXT)
+tools_auto_array_test_OBJECTS = $(am_tools_auto_array_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_auto_array_test_DEPENDENCIES = \
+ at ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS)
+am__tools_bad_metadata_helper_SOURCES_DIST = \
+ tools/bad_metadata_helper.c
+ at ENABLE_TOOLS_TRUE@am_tools_bad_metadata_helper_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/bad_metadata_helper.$(OBJEXT)
+tools_bad_metadata_helper_OBJECTS = \
+ $(am_tools_bad_metadata_helper_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_bad_metadata_helper_DEPENDENCIES = \
+ at ENABLE_TOOLS_TRUE@ libatf-c.la
+am__tools_config_file_test_SOURCES_DIST = tools/config_file_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_config_file_test_OBJECTS = tools/tools_config_file_test-config_file_test.$(OBJEXT)
+tools_config_file_test_OBJECTS = $(am_tools_config_file_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_config_file_test_DEPENDENCIES = \
+ at ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS)
+am__tools_config_test_SOURCES_DIST = tools/config_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_config_test_OBJECTS = tools/tools_config_test-config_test.$(OBJEXT)
+tools_config_test_OBJECTS = $(am_tools_config_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_config_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_env_test_SOURCES_DIST = tools/env_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_env_test_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/tools_env_test-env_test.$(OBJEXT)
+tools_env_test_OBJECTS = $(am_tools_env_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_env_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_expand_test_SOURCES_DIST = tools/expand_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_expand_test_OBJECTS = tools/tools_expand_test-expand_test.$(OBJEXT)
+tools_expand_test_OBJECTS = $(am_tools_expand_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_expand_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_expect_helpers_SOURCES_DIST = tools/expect_helpers.c
+ at ENABLE_TOOLS_TRUE@am_tools_expect_helpers_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/expect_helpers.$(OBJEXT)
+tools_expect_helpers_OBJECTS = $(am_tools_expect_helpers_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_expect_helpers_DEPENDENCIES = libatf-c.la
+am__tools_fail_helper_SOURCES_DIST = tools/fail_helper.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_fail_helper_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/fail_helper.$(OBJEXT)
+tools_fail_helper_OBJECTS = $(am_tools_fail_helper_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_fail_helper_DEPENDENCIES = $(ATF_CXX_LIBS)
+am__tools_fs_test_SOURCES_DIST = tools/fs_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_fs_test_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/tools_fs_test-fs_test.$(OBJEXT)
+tools_fs_test_OBJECTS = $(am_tools_fs_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_fs_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_io_test_SOURCES_DIST = tools/io_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_io_test_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/tools_io_test-io_test.$(OBJEXT)
+tools_io_test_OBJECTS = $(am_tools_io_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_io_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_misc_helpers_SOURCES_DIST = tools/misc_helpers.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_misc_helpers_OBJECTS = tools/tools_misc_helpers-misc_helpers.$(OBJEXT)
+tools_misc_helpers_OBJECTS = $(am_tools_misc_helpers_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_misc_helpers_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_parser_test_SOURCES_DIST = tools/parser_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_parser_test_OBJECTS = tools/tools_parser_test-parser_test.$(OBJEXT)
+tools_parser_test_OBJECTS = $(am_tools_parser_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_parser_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_pass_helper_SOURCES_DIST = tools/pass_helper.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_pass_helper_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/pass_helper.$(OBJEXT)
+tools_pass_helper_OBJECTS = $(am_tools_pass_helper_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_pass_helper_DEPENDENCIES = $(ATF_CXX_LIBS)
+am__tools_process_helpers_SOURCES_DIST = tools/process_helpers.c
+ at ENABLE_TOOLS_TRUE@am_tools_process_helpers_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/process_helpers.$(OBJEXT)
+tools_process_helpers_OBJECTS = $(am_tools_process_helpers_OBJECTS)
+tools_process_helpers_LDADD = $(LDADD)
+am__tools_process_test_SOURCES_DIST = tools/process_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_process_test_OBJECTS = tools/tools_process_test-process_test.$(OBJEXT)
+tools_process_test_OBJECTS = $(am_tools_process_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_process_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_reader_test_SOURCES_DIST = tools/reader_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_reader_test_OBJECTS = tools/tools_reader_test-reader_test.$(OBJEXT)
+tools_reader_test_OBJECTS = $(am_tools_reader_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_reader_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_requirements_test_SOURCES_DIST = \
+ tools/requirements_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_requirements_test_OBJECTS = tools/tools_requirements_test-requirements_test.$(OBJEXT)
+tools_requirements_test_OBJECTS = \
+ $(am_tools_requirements_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_requirements_test_DEPENDENCIES = \
+ at ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS)
+am__tools_several_tcs_helper_SOURCES_DIST = \
+ tools/several_tcs_helper.c
+ at ENABLE_TOOLS_TRUE@am_tools_several_tcs_helper_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/several_tcs_helper.$(OBJEXT)
+tools_several_tcs_helper_OBJECTS = \
+ $(am_tools_several_tcs_helper_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_several_tcs_helper_DEPENDENCIES = \
+ at ENABLE_TOOLS_TRUE@ libatf-c.la
+am__tools_signals_test_SOURCES_DIST = tools/signals_test.cpp \
+ tools/signals.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_signals_test_OBJECTS = tools/tools_signals_test-signals_test.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_signals_test-signals.$(OBJEXT)
+tools_signals_test_OBJECTS = $(am_tools_signals_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_signals_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_test_program_test_SOURCES_DIST = \
+ tools/test_program_test.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_test_program_test_OBJECTS = tools/tools_test_program_test-test_program_test.$(OBJEXT)
+tools_test_program_test_OBJECTS = \
+ $(am_tools_test_program_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_test_program_test_DEPENDENCIES = \
+ at ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS)
+am__tools_text_test_SOURCES_DIST = tools/text_test.cpp tools/text.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_text_test_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/tools_text_test-text_test.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_text_test-text.$(OBJEXT)
+tools_text_test_OBJECTS = $(am_tools_text_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_text_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_ui_test_SOURCES_DIST = tools/ui_test.cpp tools/ui.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_ui_test_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/tools_ui_test-ui_test.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_ui_test-ui.$(OBJEXT)
+tools_ui_test_OBJECTS = $(am_tools_ui_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_ui_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_user_test_SOURCES_DIST = tools/user_test.cpp tools/user.cpp
+ at ENABLE_TOOLS_TRUE@am_tools_user_test_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/tools_user_test-user_test.$(OBJEXT) \
+ at ENABLE_TOOLS_TRUE@ tools/tools_user_test-user.$(OBJEXT)
+tools_user_test_OBJECTS = $(am_tools_user_test_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_user_test_DEPENDENCIES = $(TOOLS_LDADD) \
+ at ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS)
+am__tools_zero_tcs_helper_SOURCES_DIST = tools/zero_tcs_helper.c
+ at ENABLE_TOOLS_TRUE@am_tools_zero_tcs_helper_OBJECTS = \
+ at ENABLE_TOOLS_TRUE@ tools/zero_tcs_helper.$(OBJEXT)
+tools_zero_tcs_helper_OBJECTS = $(am_tools_zero_tcs_helper_OBJECTS)
+ at ENABLE_TOOLS_TRUE@tools_zero_tcs_helper_DEPENDENCIES = libatf-c.la
SCRIPTS = $(tests_atf_c_SCRIPTS) $(tests_atf_c___SCRIPTS) \
- $(tests_atf_config_SCRIPTS) $(tests_atf_report_SCRIPTS) \
- $(tests_atf_run_SCRIPTS) $(tests_atf_sh_SCRIPTS) \
- $(tests_test_programs_SCRIPTS)
+ $(tests_atf_sh_SCRIPTS) $(tests_test_programs_SCRIPTS) \
+ $(tests_tools_SCRIPTS)
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -1182,7 +1112,9 @@ AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
-SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \
+SOURCES = $(tools_libtools_a_SOURCES) \
+ $(nodist_tools_libtools_a_SOURCES) \
+ $(atf_c___detail_libtest_helpers_la_SOURCES) \
$(atf_c_detail_libtest_helpers_la_SOURCES) \
$(libatf_c___la_SOURCES) $(libatf_c_la_SOURCES) \
$(nodist_libatf_c_la_SOURCES) $(atf_c___atf_c___test_SOURCES) \
@@ -1192,13 +1124,11 @@ SOURCES = $(atf_c___detail_libtest_helpe
$(atf_c___detail_auto_array_test_SOURCES) \
$(atf_c___detail_env_test_SOURCES) \
$(atf_c___detail_exceptions_test_SOURCES) \
- $(atf_c___detail_expand_test_SOURCES) \
$(atf_c___detail_fs_test_SOURCES) \
- $(atf_c___detail_parser_test_SOURCES) \
$(atf_c___detail_process_test_SOURCES) \
$(atf_c___detail_sanity_test_SOURCES) \
$(atf_c___detail_text_test_SOURCES) \
- $(atf_c___detail_ui_test_SOURCES) \
+ $(atf_c___detail_version_helper_SOURCES) \
$(atf_c___macros_test_SOURCES) $(atf_c___tests_test_SOURCES) \
$(atf_c___utils_test_SOURCES) $(atf_c_atf_c_test_SOURCES) \
$(atf_c_build_test_SOURCES) $(atf_c_check_test_SOURCES) \
@@ -1212,36 +1142,38 @@ SOURCES = $(atf_c___detail_libtest_helpe
$(atf_c_detail_process_test_SOURCES) \
$(atf_c_detail_sanity_test_SOURCES) \
$(atf_c_detail_text_test_SOURCES) \
- $(atf_c_detail_user_test_SOURCES) $(atf_c_error_test_SOURCES) \
- $(atf_c_macros_test_SOURCES) $(atf_c_tc_test_SOURCES) \
- $(atf_c_tp_test_SOURCES) $(atf_c_utils_test_SOURCES) \
- $(atf_config_atf_config_SOURCES) \
- $(atf_report_atf_report_SOURCES) \
- $(atf_report_fail_helper_SOURCES) \
- $(atf_report_misc_helpers_SOURCES) \
- $(atf_report_pass_helper_SOURCES) \
- $(atf_report_reader_test_SOURCES) $(atf_run_atf_run_SOURCES) \
- $(atf_run_atffile_test_SOURCES) \
- $(atf_run_bad_metadata_helper_SOURCES) \
- $(atf_run_config_test_SOURCES) \
- $(atf_run_expect_helpers_SOURCES) $(atf_run_fs_test_SOURCES) \
- $(atf_run_io_test_SOURCES) $(atf_run_misc_helpers_SOURCES) \
- $(atf_run_pass_helper_SOURCES) \
- $(atf_run_requirements_test_SOURCES) \
- $(atf_run_several_tcs_helper_SOURCES) \
- $(atf_run_signals_test_SOURCES) \
- $(atf_run_test_program_test_SOURCES) \
- $(atf_run_user_test_SOURCES) \
- $(atf_run_zero_tcs_helper_SOURCES) $(atf_sh_atf_check_SOURCES) \
- $(atf_sh_atf_sh_SOURCES) $(atf_version_atf_version_SOURCES) \
- $(nodist_atf_version_atf_version_SOURCES) \
- $(bootstrap_h_app_empty_SOURCES) \
+ $(atf_c_detail_user_test_SOURCES) \
+ $(atf_c_detail_version_helper_SOURCES) \
+ $(atf_c_error_test_SOURCES) $(atf_c_macros_test_SOURCES) \
+ $(atf_c_tc_test_SOURCES) $(atf_c_tp_test_SOURCES) \
+ $(atf_c_utils_test_SOURCES) $(atf_sh_atf_check_SOURCES) \
+ $(atf_sh_atf_sh_SOURCES) $(bootstrap_h_app_empty_SOURCES) \
$(bootstrap_h_app_opts_args_SOURCES) \
$(bootstrap_h_tp_basic_c_SOURCES) \
$(bootstrap_h_tp_basic_cpp_SOURCES) \
$(test_programs_c_helpers_SOURCES) \
- $(test_programs_cpp_helpers_SOURCES)
-DIST_SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \
+ $(test_programs_cpp_helpers_SOURCES) \
+ $(tools_application_test_SOURCES) $(tools_atf_config_SOURCES) \
+ $(tools_atf_report_SOURCES) $(tools_atf_run_SOURCES) \
+ $(tools_atf_version_SOURCES) \
+ $(nodist_tools_atf_version_SOURCES) \
+ $(tools_atffile_test_SOURCES) $(tools_auto_array_test_SOURCES) \
+ $(tools_bad_metadata_helper_SOURCES) \
+ $(tools_config_file_test_SOURCES) $(tools_config_test_SOURCES) \
+ $(tools_env_test_SOURCES) $(tools_expand_test_SOURCES) \
+ $(tools_expect_helpers_SOURCES) $(tools_fail_helper_SOURCES) \
+ $(tools_fs_test_SOURCES) $(tools_io_test_SOURCES) \
+ $(tools_misc_helpers_SOURCES) $(tools_parser_test_SOURCES) \
+ $(tools_pass_helper_SOURCES) $(tools_process_helpers_SOURCES) \
+ $(tools_process_test_SOURCES) $(tools_reader_test_SOURCES) \
+ $(tools_requirements_test_SOURCES) \
+ $(tools_several_tcs_helper_SOURCES) \
+ $(tools_signals_test_SOURCES) \
+ $(tools_test_program_test_SOURCES) $(tools_text_test_SOURCES) \
+ $(tools_ui_test_SOURCES) $(tools_user_test_SOURCES) \
+ $(tools_zero_tcs_helper_SOURCES)
+DIST_SOURCES = $(am__tools_libtools_a_SOURCES_DIST) \
+ $(atf_c___detail_libtest_helpers_la_SOURCES) \
$(atf_c_detail_libtest_helpers_la_SOURCES) \
$(libatf_c___la_SOURCES) $(libatf_c_la_SOURCES) \
$(atf_c___atf_c___test_SOURCES) $(atf_c___build_test_SOURCES) \
@@ -1250,13 +1182,11 @@ DIST_SOURCES = $(atf_c___detail_libtest_
$(atf_c___detail_auto_array_test_SOURCES) \
$(atf_c___detail_env_test_SOURCES) \
$(atf_c___detail_exceptions_test_SOURCES) \
- $(atf_c___detail_expand_test_SOURCES) \
$(atf_c___detail_fs_test_SOURCES) \
- $(atf_c___detail_parser_test_SOURCES) \
$(atf_c___detail_process_test_SOURCES) \
$(atf_c___detail_sanity_test_SOURCES) \
$(atf_c___detail_text_test_SOURCES) \
- $(atf_c___detail_ui_test_SOURCES) \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list