From owner-svn-src-vendor@FreeBSD.ORG Wed Feb 12 19:26:09 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C36DD5AD; Wed, 12 Feb 2014 19:26:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6E9BD14F8; Wed, 12 Feb 2014 19:26:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CJQ9HT048900; Wed, 12 Feb 2014 19:26:09 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CJQ9El048899; Wed, 12 Feb 2014 19:26:09 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201402121926.s1CJQ9El048899@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 12 Feb 2014 19:26:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r261806 - vendor-sys/acpica/dist/source/tools/acpiexec X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 19:26:10 -0000 Author: jkim Date: Wed Feb 12 19:26:08 2014 New Revision: 261806 URL: http://svnweb.freebsd.org/changeset/base/261806 Log: Restore the BSD license and update copyright date. Reported by: Sascha Widner (via devel@acpica.org) Modified: vendor-sys/acpica/dist/source/tools/acpiexec/aehandlers.c Modified: vendor-sys/acpica/dist/source/tools/acpiexec/aehandlers.c ============================================================================== --- vendor-sys/acpica/dist/source/tools/acpiexec/aehandlers.c Wed Feb 12 19:22:48 2014 (r261805) +++ vendor-sys/acpica/dist/source/tools/acpiexec/aehandlers.c Wed Feb 12 19:26:08 2014 (r261806) @@ -4,114 +4,42 @@ * *****************************************************************************/ -/****************************************************************************** - * - * 1. Copyright Notice - * - * Some or all of this work - Copyright (c) 1999 - 2014, Intel Corp. +/* + * Copyright (C) 2000 - 2014, Intel Corp. * All rights reserved. * - * 2. License - * - * 2.1. This is your license from Intel Corp. under its intellectual property - * rights. You may have additional license terms from the party that provided - * you this software, covering your right to use that party's intellectual - * property rights. - * - * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a - * copy of the source code appearing in this file ("Covered Code") an - * irrevocable, perpetual, worldwide license under Intel's copyrights in the - * base code distributed originally by Intel ("Original Intel Code") to copy, - * make derivatives, distribute, use and display any portion of the Covered - * Code in any form, with the right to sublicense such rights; and - * - * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent - * license (with the right to sublicense), under only those claims of Intel - * patents that are infringed by the Original Intel Code, to make, use, sell, - * offer to sell, and import the Covered Code and derivative works thereof - * solely to the minimum extent necessary to exercise the above copyright - * license, and in no event shall the patent license extend to any additions - * to or modifications of the Original Intel Code. No other license or right - * is granted directly or by implication, estoppel or otherwise; - * - * The above copyright and patent license is granted only if the following - * conditions are met: - * - * 3. Conditions - * - * 3.1. Redistribution of Source with Rights to Further Distribute Source. - * Redistribution of source code of any substantial portion of the Covered - * Code or modification with rights to further distribute source must include - * the above Copyright Notice, the above License, this list of Conditions, - * and the following Disclaimer and Export Compliance provision. In addition, - * Licensee must cause all Covered Code to which Licensee contributes to - * contain a file documenting the changes Licensee made to create that Covered - * Code and the date of any change. Licensee must include in that file the - * documentation of any changes made by any predecessor Licensee. Licensee - * must include a prominent statement that the modification is derived, - * directly or indirectly, from Original Intel Code. - * - * 3.2. Redistribution of Source with no Rights to Further Distribute Source. - * Redistribution of source code of any substantial portion of the Covered - * Code or modification without rights to further distribute source must - * include the following Disclaimer and Export Compliance provision in the - * documentation and/or other materials provided with distribution. In - * addition, Licensee may not authorize further sublicense of source of any - * portion of the Covered Code, and must include terms to the effect that the - * license from Licensee to its licensee is limited to the intellectual - * property embodied in the software Licensee provides to its licensee, and - * not to intellectual property embodied in modifications its licensee may - * make. - * - * 3.3. Redistribution of Executable. Redistribution in executable form of any - * substantial portion of the Covered Code or modification must reproduce the - * above Copyright Notice, and the following Disclaimer and Export Compliance - * provision in the documentation and/or other materials provided with the - * distribution. - * - * 3.4. Intel retains all right, title, and interest in and to the Original - * Intel Code. - * - * 3.5. Neither the name Intel nor any other trademark owned or controlled by - * Intel shall be used in advertising or otherwise to promote the sale, use or - * other dealings in products derived from or relating to the Covered Code - * without prior written authorization from Intel. - * - * 4. Disclaimer and Export Compliance - * - * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED - * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE - * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, - * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY - * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY - * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A - * PARTICULAR PURPOSE. - * - * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES - * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR - * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, - * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY - * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL - * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS - * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY - * LIMITED REMEDY. - * - * 4.3. Licensee shall not export, either directly or indirectly, any of this - * software or system incorporating such software without first obtaining any - * required license or other approval from the U. S. Department of Commerce or - * any other agency or department of the United States Government. In the - * event Licensee exports any such software from the United States or - * re-exports any such software from a foreign destination, Licensee shall - * ensure that the distribution and export/re-export of the software is in - * compliance with all laws, regulations, orders, or other restrictions of the - * U.S. Export Administration Regulations. Licensee agrees that neither it nor - * any of its subsidiaries will export/re-export any technical data, process, - * software, or service, directly or indirectly, to any country for which the - * United States government or any agency thereof requires an export license, - * other governmental approval, or letter of assurance, without first obtaining - * such license, approval or letter. - * - *****************************************************************************/ + * 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, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. + */ #include "aecommon.h" From owner-svn-src-vendor@FreeBSD.ORG Fri Feb 14 14:41:27 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42FA230A; Fri, 14 Feb 2014 14:41:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 291761E26; Fri, 14 Feb 2014 14:41:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EEfRtC076603; Fri, 14 Feb 2014 14:41:27 GMT (envelope-from jmmv@svn.freebsd.org) Received: (from jmmv@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EEfQhZ076598; Fri, 14 Feb 2014 14:41:26 GMT (envelope-from jmmv@svn.freebsd.org) Message-Id: <201402141441.s1EEfQhZ076598@svn.freebsd.org> From: Julio Merino Date: Fri, 14 Feb 2014 14:41:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: 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... X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 14:41:27 -0000 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) -@ENABLE_TOOLS_TRUE@am__append_1 = doc/atf.7 -@ENABLE_TOOLS_TRUE@am__append_2 = doc/atf.7 -@ENABLE_TOOLS_TRUE@am__append_3 = doc/atf.7.in -@ENABLE_TOOLS_TRUE@am__append_4 = doc/atf-formats.5 \ -@ENABLE_TOOLS_TRUE@ atf-report/atf-report.1 \ -@ENABLE_TOOLS_TRUE@ atf-config/atf-config.1 atf-run/atf-run.1 \ -@ENABLE_TOOLS_TRUE@ atf-version/atf-version.1 tests_test_programs_PROGRAMS = test-programs/c_helpers$(EXEEXT) \ test-programs/cpp_helpers$(EXEEXT) -@ENABLE_TOOLS_TRUE@am__append_5 = atf-report/atf-report \ -@ENABLE_TOOLS_TRUE@ atf-config/atf-config atf-run/atf-run \ -@ENABLE_TOOLS_TRUE@ atf-version/atf-version -@ENABLE_TOOLS_TRUE@am__append_6 = $(css_DATA) $(dtd_DATA) $(xsl_DATA) \ -@ENABLE_TOOLS_TRUE@ $(tests_atf_report_DATA) \ -@ENABLE_TOOLS_TRUE@ atf-report/integration_test.sh \ -@ENABLE_TOOLS_TRUE@ $(tests_atf_config_DATA) \ -@ENABLE_TOOLS_TRUE@ atf-config/integration_test.sh \ -@ENABLE_TOOLS_TRUE@ $(tests_atf_run_DATA) \ -@ENABLE_TOOLS_TRUE@ atf-run/integration_test.sh $(hooks_DATA) \ -@ENABLE_TOOLS_TRUE@ $(eg_DATA) atf-version/generate-revision.sh -@ENABLE_TOOLS_TRUE@tests_atf_report_PROGRAMS = \ -@ENABLE_TOOLS_TRUE@ atf-report/fail_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-report/misc_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-report/pass_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-report/reader_test$(EXEEXT) -@ENABLE_TOOLS_TRUE@am__append_7 = atf-report/integration_test \ -@ENABLE_TOOLS_TRUE@ atf-config/integration_test \ -@ENABLE_TOOLS_TRUE@ atf-run/integration_test \ -@ENABLE_TOOLS_TRUE@ atf-version/revision.h \ -@ENABLE_TOOLS_TRUE@ atf-version/revision.h.stamp \ -@ENABLE_TOOLS_TRUE@ installcheck.fifo installcheck.log -@ENABLE_TOOLS_TRUE@tests_atf_run_PROGRAMS = \ -@ENABLE_TOOLS_TRUE@ atf-run/atffile_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/bad_metadata_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/config_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/expect_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/fs_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/io_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/misc_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/pass_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/several_tcs_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/requirements_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/signals_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/test_program_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/user_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/zero_tcs_helper$(EXEEXT) -@ENABLE_TOOLS_TRUE@am__append_8 = atf-version/revision.h -@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. +@ENABLE_TOOLS_TRUE@am__append_1 = kill-defs-hpp +@ENABLE_TOOLS_TRUE@am__append_2 = tools/atf-config tools/atf-report \ +@ENABLE_TOOLS_TRUE@ tools/atf-run tools/atf-version +@ENABLE_TOOLS_TRUE@am__append_3 = tools/atf-config.1 \ +@ENABLE_TOOLS_TRUE@ tools/atf-report.1 tools/atf-run.1 \ +@ENABLE_TOOLS_TRUE@ tools/atf-version.1 tools/atf-formats.5 +@ENABLE_TOOLS_TRUE@am__append_4 = tools/generate-revision.sh \ +@ENABLE_TOOLS_TRUE@ tools/atf.7.in $(css_DATA) $(dtd_DATA) \ +@ENABLE_TOOLS_TRUE@ $(eg_DATA) $(hooks_DATA) $(xsl_DATA) \ +@ENABLE_TOOLS_TRUE@ $(tests_tools_DATA) \ +@ENABLE_TOOLS_TRUE@ tools/atf-config_test.sh \ +@ENABLE_TOOLS_TRUE@ tools/atf-report_test.sh \ +@ENABLE_TOOLS_TRUE@ tools/atf-run_test.sh +@ENABLE_TOOLS_TRUE@am__append_5 = tools/revision.h +@ENABLE_TOOLS_TRUE@am__append_6 = tools/revision.h \ +@ENABLE_TOOLS_TRUE@ tools/revision.h.stamp tools/atf.7 \ +@ENABLE_TOOLS_TRUE@ tools/atf-config_test tools/atf-report_test \ +@ENABLE_TOOLS_TRUE@ tools/atf-run_test installcheck.fifo \ +@ENABLE_TOOLS_TRUE@ installcheck.log +@ENABLE_TOOLS_TRUE@am__append_7 = tools/revision.h.stamp \ @ENABLE_TOOLS_TRUE@ installcheck-atf -@ENABLE_TOOLS_TRUE@am__append_10 = installcheck-atf -@ENABLE_TOOLS_FALSE@@HAVE_KYUA_TRUE@am__append_11 = installcheck-kyua -@ENABLE_TOOLS_TRUE@am__append_12 = Atffile +@ENABLE_TOOLS_TRUE@am__append_8 = tools/atf.7 +@ENABLE_TOOLS_TRUE@tests_tools_PROGRAMS = \ +@ENABLE_TOOLS_TRUE@ tools/application_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/atffile_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/auto_array_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/bad_metadata_helper$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/config_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/config_file_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/env_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/expand_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/expect_helpers$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/fail_helper$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/fs_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/io_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/misc_helpers$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/parser_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/process_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/pass_helper$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/process_helpers$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/reader_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/requirements_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/several_tcs_helper$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/signals_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/test_program_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/text_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/ui_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/user_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/zero_tcs_helper$(EXEEXT) +@ENABLE_TOOLS_TRUE@am__append_9 = installcheck-atf +@ENABLE_TOOLS_FALSE@@HAVE_KYUA_TRUE@am__append_10 = installcheck-kyua +@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_@AM_V@) +am__v_AR_ = $(am__v_AR_@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 +@ENABLE_TOOLS_TRUE@am_tools_libtools_a_OBJECTS = tools/tools_libtools_a-application.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-atffile.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-config.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-config_file.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-env.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-exceptions.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-expand.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-fs.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-io.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-parser.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-process.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-reader.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-requirements.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-signals.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-test-program.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-text.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-timers.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-ui.$(OBJEXT) \ +@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 $@ -@ENABLE_TOOLS_TRUE@am__EXEEXT_1 = atf-report/atf-report$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-config/atf-config$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf-run$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-version/atf-version$(EXEEXT) +@ENABLE_TOOLS_TRUE@am__EXEEXT_1 = tools/atf-config$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/atf-report$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/atf-run$(EXEEXT) \ +@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 -@ENABLE_TOOLS_TRUE@am_atf_config_atf_config_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-config/atf-config.$(OBJEXT) -atf_config_atf_config_OBJECTS = $(am_atf_config_atf_config_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_config_atf_config_DEPENDENCIES = \ -@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 -@ENABLE_TOOLS_TRUE@am_atf_report_atf_report_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-report/atf-report.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-report/reader.$(OBJEXT) -atf_report_atf_report_OBJECTS = $(am_atf_report_atf_report_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_report_atf_report_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_report_fail_helper_SOURCES_DIST = atf-report/fail_helper.cpp -@ENABLE_TOOLS_TRUE@am_atf_report_fail_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-report/fail_helper.$(OBJEXT) -atf_report_fail_helper_OBJECTS = $(am_atf_report_fail_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_report_fail_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_report_misc_helpers_SOURCES_DIST = \ - atf-report/misc_helpers.cpp -@ENABLE_TOOLS_TRUE@am_atf_report_misc_helpers_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-report/misc_helpers.$(OBJEXT) -atf_report_misc_helpers_OBJECTS = \ - $(am_atf_report_misc_helpers_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_report_misc_helpers_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_report_pass_helper_SOURCES_DIST = atf-report/pass_helper.cpp -@ENABLE_TOOLS_TRUE@am_atf_report_pass_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-report/pass_helper.$(OBJEXT) -atf_report_pass_helper_OBJECTS = $(am_atf_report_pass_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_report_pass_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_report_reader_test_SOURCES_DIST = atf-report/reader_test.cpp \ - atf-report/reader.cpp -@ENABLE_TOOLS_TRUE@am_atf_report_reader_test_OBJECTS = atf-report/atf_report_reader_test-reader_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-report/atf_report_reader_test-reader.$(OBJEXT) -atf_report_reader_test_OBJECTS = $(am_atf_report_reader_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_report_reader_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \ -@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 -@ENABLE_TOOLS_TRUE@am_atf_run_atf_run_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-atf-run.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-atffile.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-config.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-fs.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-io.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-requirements.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-signals.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-test-program.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-timer.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-user.$(OBJEXT) -atf_run_atf_run_OBJECTS = $(am_atf_run_atf_run_OBJECTS) -@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 -@ENABLE_TOOLS_TRUE@am_atf_run_atffile_test_OBJECTS = atf-run/atf_run_atffile_test-atffile_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atffile_test-atffile.$(OBJEXT) -atf_run_atffile_test_OBJECTS = $(am_atf_run_atffile_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_atffile_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_bad_metadata_helper_SOURCES_DIST = \ - atf-run/bad_metadata_helper.c -@ENABLE_TOOLS_TRUE@am_atf_run_bad_metadata_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/bad_metadata_helper.$(OBJEXT) -atf_run_bad_metadata_helper_OBJECTS = \ - $(am_atf_run_bad_metadata_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_bad_metadata_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ libatf-c.la -am__atf_run_config_test_SOURCES_DIST = atf-run/config_test.cpp \ - atf-run/config.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_config_test_OBJECTS = atf-run/atf_run_config_test-config_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_config_test-config.$(OBJEXT) -atf_run_config_test_OBJECTS = $(am_atf_run_config_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_config_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_expect_helpers_SOURCES_DIST = atf-run/expect_helpers.c -@ENABLE_TOOLS_TRUE@am_atf_run_expect_helpers_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/expect_helpers.$(OBJEXT) -atf_run_expect_helpers_OBJECTS = $(am_atf_run_expect_helpers_OBJECTS) -@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 -@ENABLE_TOOLS_TRUE@am_atf_run_fs_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/fs_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/fs.$(OBJEXT) atf-run/user.$(OBJEXT) -atf_run_fs_test_OBJECTS = $(am_atf_run_fs_test_OBJECTS) -@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 -@ENABLE_TOOLS_TRUE@am_atf_run_io_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/io_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/io.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/signals.$(OBJEXT) -atf_run_io_test_OBJECTS = $(am_atf_run_io_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_io_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_misc_helpers_SOURCES_DIST = atf-run/misc_helpers.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_misc_helpers_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/misc_helpers.$(OBJEXT) -atf_run_misc_helpers_OBJECTS = $(am_atf_run_misc_helpers_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_misc_helpers_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_pass_helper_SOURCES_DIST = atf-run/pass_helper.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_pass_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/pass_helper.$(OBJEXT) -atf_run_pass_helper_OBJECTS = $(am_atf_run_pass_helper_OBJECTS) -@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 -@ENABLE_TOOLS_TRUE@am_atf_run_requirements_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/requirements_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/requirements.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/user.$(OBJEXT) -atf_run_requirements_test_OBJECTS = \ - $(am_atf_run_requirements_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_requirements_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_several_tcs_helper_SOURCES_DIST = \ - atf-run/several_tcs_helper.c -@ENABLE_TOOLS_TRUE@am_atf_run_several_tcs_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/several_tcs_helper.$(OBJEXT) -atf_run_several_tcs_helper_OBJECTS = \ - $(am_atf_run_several_tcs_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_several_tcs_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ libatf-c.la -am__atf_run_signals_test_SOURCES_DIST = atf-run/signals_test.cpp \ - atf-run/signals.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_signals_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/signals_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/signals.$(OBJEXT) -atf_run_signals_test_OBJECTS = $(am_atf_run_signals_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_signals_test_DEPENDENCIES = \ -@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 -@ENABLE_TOOLS_TRUE@am_atf_run_test_program_test_OBJECTS = atf-run/atf_run_test_program_test-test_program_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-fs.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-io.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-requirements.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-signals.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-test-program.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-timer.$(OBJEXT) \ -@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) -@ENABLE_TOOLS_TRUE@atf_run_test_program_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_user_test_SOURCES_DIST = atf-run/user_test.cpp \ - atf-run/user.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_user_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/user_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/user.$(OBJEXT) -atf_run_user_test_OBJECTS = $(am_atf_run_user_test_OBJECTS) -@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 -@ENABLE_TOOLS_TRUE@am_atf_run_zero_tcs_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/zero_tcs_helper.$(OBJEXT) -atf_run_zero_tcs_helper_OBJECTS = \ - $(am_atf_run_zero_tcs_helper_OBJECTS) -@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 -@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) -@ENABLE_TOOLS_TRUE@atf_version_atf_version_DEPENDENCIES = \ -@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 +@ENABLE_TOOLS_TRUE@am_tools_application_test_OBJECTS = tools/tools_application_test-application_test.$(OBJEXT) +tools_application_test_OBJECTS = $(am_tools_application_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_application_test_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) +am__tools_atf_config_SOURCES_DIST = tools/atf-config.cpp +@ENABLE_TOOLS_TRUE@am_tools_atf_config_OBJECTS = tools/tools_atf_config-atf-config.$(OBJEXT) +tools_atf_config_OBJECTS = $(am_tools_atf_config_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_atf_config_DEPENDENCIES = $(TOOLS_LDADD) +am__tools_atf_report_SOURCES_DIST = tools/atf-report.cpp +@ENABLE_TOOLS_TRUE@am_tools_atf_report_OBJECTS = tools/tools_atf_report-atf-report.$(OBJEXT) +tools_atf_report_OBJECTS = $(am_tools_atf_report_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_atf_report_DEPENDENCIES = $(TOOLS_LDADD) +am__tools_atf_run_SOURCES_DIST = tools/atf-run.cpp +@ENABLE_TOOLS_TRUE@am_tools_atf_run_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_atf_run-atf-run.$(OBJEXT) +tools_atf_run_OBJECTS = $(am_tools_atf_run_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_atf_run_DEPENDENCIES = $(TOOLS_LDADD) +am__tools_atf_version_SOURCES_DIST = tools/atf-version.cpp +@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) +@ENABLE_TOOLS_TRUE@tools_atf_version_DEPENDENCIES = $(TOOLS_LDADD) +am__tools_atffile_test_SOURCES_DIST = tools/atffile_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_atffile_test_OBJECTS = tools/tools_atffile_test-atffile_test.$(OBJEXT) +tools_atffile_test_OBJECTS = $(am_tools_atffile_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_atffile_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_auto_array_test_SOURCES_DIST = tools/auto_array_test.cpp +@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) +@ENABLE_TOOLS_TRUE@tools_auto_array_test_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) +am__tools_bad_metadata_helper_SOURCES_DIST = \ + tools/bad_metadata_helper.c +@ENABLE_TOOLS_TRUE@am_tools_bad_metadata_helper_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/bad_metadata_helper.$(OBJEXT) +tools_bad_metadata_helper_OBJECTS = \ + $(am_tools_bad_metadata_helper_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_bad_metadata_helper_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ libatf-c.la +am__tools_config_file_test_SOURCES_DIST = tools/config_file_test.cpp +@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) +@ENABLE_TOOLS_TRUE@tools_config_file_test_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) +am__tools_config_test_SOURCES_DIST = tools/config_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_config_test_OBJECTS = tools/tools_config_test-config_test.$(OBJEXT) +tools_config_test_OBJECTS = $(am_tools_config_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_config_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_env_test_SOURCES_DIST = tools/env_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_env_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_env_test-env_test.$(OBJEXT) +tools_env_test_OBJECTS = $(am_tools_env_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_env_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_expand_test_SOURCES_DIST = tools/expand_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_expand_test_OBJECTS = tools/tools_expand_test-expand_test.$(OBJEXT) +tools_expand_test_OBJECTS = $(am_tools_expand_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_expand_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_expect_helpers_SOURCES_DIST = tools/expect_helpers.c +@ENABLE_TOOLS_TRUE@am_tools_expect_helpers_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/expect_helpers.$(OBJEXT) +tools_expect_helpers_OBJECTS = $(am_tools_expect_helpers_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_expect_helpers_DEPENDENCIES = libatf-c.la +am__tools_fail_helper_SOURCES_DIST = tools/fail_helper.cpp +@ENABLE_TOOLS_TRUE@am_tools_fail_helper_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/fail_helper.$(OBJEXT) +tools_fail_helper_OBJECTS = $(am_tools_fail_helper_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_fail_helper_DEPENDENCIES = $(ATF_CXX_LIBS) +am__tools_fs_test_SOURCES_DIST = tools/fs_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_fs_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_fs_test-fs_test.$(OBJEXT) +tools_fs_test_OBJECTS = $(am_tools_fs_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_fs_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_io_test_SOURCES_DIST = tools/io_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_io_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_io_test-io_test.$(OBJEXT) +tools_io_test_OBJECTS = $(am_tools_io_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_io_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_misc_helpers_SOURCES_DIST = tools/misc_helpers.cpp +@ENABLE_TOOLS_TRUE@am_tools_misc_helpers_OBJECTS = tools/tools_misc_helpers-misc_helpers.$(OBJEXT) +tools_misc_helpers_OBJECTS = $(am_tools_misc_helpers_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_misc_helpers_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_parser_test_SOURCES_DIST = tools/parser_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_parser_test_OBJECTS = tools/tools_parser_test-parser_test.$(OBJEXT) +tools_parser_test_OBJECTS = $(am_tools_parser_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_parser_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_pass_helper_SOURCES_DIST = tools/pass_helper.cpp +@ENABLE_TOOLS_TRUE@am_tools_pass_helper_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/pass_helper.$(OBJEXT) +tools_pass_helper_OBJECTS = $(am_tools_pass_helper_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_pass_helper_DEPENDENCIES = $(ATF_CXX_LIBS) +am__tools_process_helpers_SOURCES_DIST = tools/process_helpers.c +@ENABLE_TOOLS_TRUE@am_tools_process_helpers_OBJECTS = \ +@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 +@ENABLE_TOOLS_TRUE@am_tools_process_test_OBJECTS = tools/tools_process_test-process_test.$(OBJEXT) +tools_process_test_OBJECTS = $(am_tools_process_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_process_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_reader_test_SOURCES_DIST = tools/reader_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_reader_test_OBJECTS = tools/tools_reader_test-reader_test.$(OBJEXT) +tools_reader_test_OBJECTS = $(am_tools_reader_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_reader_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_requirements_test_SOURCES_DIST = \ + tools/requirements_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_requirements_test_OBJECTS = tools/tools_requirements_test-requirements_test.$(OBJEXT) +tools_requirements_test_OBJECTS = \ + $(am_tools_requirements_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_requirements_test_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) +am__tools_several_tcs_helper_SOURCES_DIST = \ + tools/several_tcs_helper.c +@ENABLE_TOOLS_TRUE@am_tools_several_tcs_helper_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/several_tcs_helper.$(OBJEXT) +tools_several_tcs_helper_OBJECTS = \ + $(am_tools_several_tcs_helper_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_several_tcs_helper_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ libatf-c.la +am__tools_signals_test_SOURCES_DIST = tools/signals_test.cpp \ + tools/signals.cpp +@ENABLE_TOOLS_TRUE@am_tools_signals_test_OBJECTS = tools/tools_signals_test-signals_test.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_signals_test-signals.$(OBJEXT) +tools_signals_test_OBJECTS = $(am_tools_signals_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_signals_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_test_program_test_SOURCES_DIST = \ + tools/test_program_test.cpp +@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) +@ENABLE_TOOLS_TRUE@tools_test_program_test_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) +am__tools_text_test_SOURCES_DIST = tools/text_test.cpp tools/text.cpp +@ENABLE_TOOLS_TRUE@am_tools_text_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_text_test-text_test.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_text_test-text.$(OBJEXT) +tools_text_test_OBJECTS = $(am_tools_text_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_text_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_ui_test_SOURCES_DIST = tools/ui_test.cpp tools/ui.cpp +@ENABLE_TOOLS_TRUE@am_tools_ui_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_ui_test-ui_test.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_ui_test-ui.$(OBJEXT) +tools_ui_test_OBJECTS = $(am_tools_ui_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_ui_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_user_test_SOURCES_DIST = tools/user_test.cpp tools/user.cpp +@ENABLE_TOOLS_TRUE@am_tools_user_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_user_test-user_test.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_user_test-user.$(OBJEXT) +tools_user_test_OBJECTS = $(am_tools_user_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_user_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_zero_tcs_helper_SOURCES_DIST = tools/zero_tcs_helper.c +@ENABLE_TOOLS_TRUE@am_tools_zero_tcs_helper_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/zero_tcs_helper.$(OBJEXT) +tools_zero_tcs_helper_OBJECTS = $(am_tools_zero_tcs_helper_OBJECTS) +@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_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -1182,7 +1112,9 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@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 *** From owner-svn-src-vendor@FreeBSD.ORG Fri Feb 14 14:42:09 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 01932450; Fri, 14 Feb 2014 14:42:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C51791E31; Fri, 14 Feb 2014 14:42:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EEg8XV077118; Fri, 14 Feb 2014 14:42:08 GMT (envelope-from jmmv@svn.freebsd.org) Received: (from jmmv@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EEg8qf077117; Fri, 14 Feb 2014 14:42:08 GMT (envelope-from jmmv@svn.freebsd.org) Message-Id: <201402141442.s1EEg8qf077117@svn.freebsd.org> From: Julio Merino Date: Fri, 14 Feb 2014 14:42:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r261887 - vendor/atf/atf-0.19 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 14:42:09 -0000 Author: jmmv Date: Fri Feb 14 14:42:08 2014 New Revision: 261887 URL: http://svnweb.freebsd.org/changeset/base/261887 Log: Tag import of atf-0.19. Added: vendor/atf/atf-0.19/ - copied from r261886, vendor/atf/dist/ From owner-svn-src-vendor@FreeBSD.ORG Fri Feb 14 14:44:05 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 293D07A5; Fri, 14 Feb 2014 14:44:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 11CBC1F55; Fri, 14 Feb 2014 14:44:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EEi4wG077490; Fri, 14 Feb 2014 14:44:04 GMT (envelope-from jmmv@svn.freebsd.org) Received: (from jmmv@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EEi4wL077482; Fri, 14 Feb 2014 14:44:04 GMT (envelope-from jmmv@svn.freebsd.org) Message-Id: <201402141444.s1EEi4wL077482@svn.freebsd.org> From: Julio Merino Date: Fri, 14 Feb 2014 14:44:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r261888 - in vendor/atf/dist: . admin atf-c atf-c++ atf-c++/detail atf-c/detail atf-sh bootstrap m4 test-programs tools tools/sample tools/share X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 14:44:05 -0000 Author: jmmv Date: Fri Feb 14 14:44:03 2014 New Revision: 261888 URL: http://svnweb.freebsd.org/changeset/base/261888 Log: Import atf-0.20: Experimental version released on February 7th, 2014. This is the first release without the code for the deprecated tools. If you require such code, please fetch a copy of the 0.19 release and extract the 'tools' directory for your own consumption. * Removed the deprecated tools. This includes atf-config, atf-report, atf-run and atf-version. Deleted: vendor/atf/dist/Atffile vendor/atf/dist/atf-c++/Atffile vendor/atf/dist/atf-c++/detail/Atffile vendor/atf/dist/atf-c/Atffile vendor/atf/dist/atf-c/detail/Atffile vendor/atf/dist/atf-sh/Atffile vendor/atf/dist/bootstrap/h_app_empty.cpp vendor/atf/dist/bootstrap/h_app_opts_args.cpp vendor/atf/dist/bootstrap/t_application_help.at vendor/atf/dist/bootstrap/t_application_opts_args.at vendor/atf/dist/bootstrap/t_atf_config.at vendor/atf/dist/bootstrap/t_atf_run.at vendor/atf/dist/m4/module-signals.m4 vendor/atf/dist/test-programs/Atffile vendor/atf/dist/tools/Atffile vendor/atf/dist/tools/Kyuafile vendor/atf/dist/tools/Makefile.am.inc vendor/atf/dist/tools/application.cpp vendor/atf/dist/tools/application.hpp vendor/atf/dist/tools/application_test.cpp vendor/atf/dist/tools/atf-config.1 vendor/atf/dist/tools/atf-config.cpp vendor/atf/dist/tools/atf-config_test.sh vendor/atf/dist/tools/atf-formats.5 vendor/atf/dist/tools/atf-report.1 vendor/atf/dist/tools/atf-report.cpp vendor/atf/dist/tools/atf-report_test.sh vendor/atf/dist/tools/atf-run.1 vendor/atf/dist/tools/atf-run.cpp vendor/atf/dist/tools/atf-run_test.sh vendor/atf/dist/tools/atf-version.1 vendor/atf/dist/tools/atf-version.cpp vendor/atf/dist/tools/atf.7.in vendor/atf/dist/tools/atffile.cpp vendor/atf/dist/tools/atffile.hpp vendor/atf/dist/tools/atffile_test.cpp vendor/atf/dist/tools/auto_array.hpp vendor/atf/dist/tools/auto_array_test.cpp vendor/atf/dist/tools/bad_metadata_helper.c vendor/atf/dist/tools/config.cpp vendor/atf/dist/tools/config.hpp vendor/atf/dist/tools/config_file.cpp vendor/atf/dist/tools/config_file.hpp vendor/atf/dist/tools/config_file_test.cpp vendor/atf/dist/tools/config_test.cpp vendor/atf/dist/tools/defs.hpp.in vendor/atf/dist/tools/env.cpp vendor/atf/dist/tools/env.hpp vendor/atf/dist/tools/env_test.cpp vendor/atf/dist/tools/exceptions.cpp vendor/atf/dist/tools/exceptions.hpp vendor/atf/dist/tools/expand.cpp vendor/atf/dist/tools/expand.hpp vendor/atf/dist/tools/expand_test.cpp vendor/atf/dist/tools/expect_helpers.c vendor/atf/dist/tools/fail_helper.cpp vendor/atf/dist/tools/fs.cpp vendor/atf/dist/tools/fs.hpp vendor/atf/dist/tools/fs_test.cpp vendor/atf/dist/tools/generate-revision.sh vendor/atf/dist/tools/io.cpp vendor/atf/dist/tools/io.hpp vendor/atf/dist/tools/io_test.cpp vendor/atf/dist/tools/misc_helpers.cpp vendor/atf/dist/tools/parser.cpp vendor/atf/dist/tools/parser.hpp vendor/atf/dist/tools/parser_test.cpp vendor/atf/dist/tools/pass_helper.cpp vendor/atf/dist/tools/process.cpp vendor/atf/dist/tools/process.hpp vendor/atf/dist/tools/process_helpers.c vendor/atf/dist/tools/process_test.cpp vendor/atf/dist/tools/reader.cpp vendor/atf/dist/tools/reader.hpp vendor/atf/dist/tools/reader_test.cpp vendor/atf/dist/tools/requirements.cpp vendor/atf/dist/tools/requirements.hpp vendor/atf/dist/tools/requirements_test.cpp vendor/atf/dist/tools/sample/atf-run.hooks vendor/atf/dist/tools/sample/common.conf vendor/atf/dist/tools/several_tcs_helper.c vendor/atf/dist/tools/share/atf-run.hooks vendor/atf/dist/tools/signals.cpp vendor/atf/dist/tools/signals.hpp vendor/atf/dist/tools/signals_test.cpp vendor/atf/dist/tools/test-program.cpp vendor/atf/dist/tools/test-program.hpp vendor/atf/dist/tools/test_helpers.hpp vendor/atf/dist/tools/test_program_test.cpp vendor/atf/dist/tools/tests-results.css vendor/atf/dist/tools/tests-results.dtd vendor/atf/dist/tools/tests-results.xsl vendor/atf/dist/tools/text.cpp vendor/atf/dist/tools/text.hpp vendor/atf/dist/tools/text_test.cpp vendor/atf/dist/tools/timers.cpp vendor/atf/dist/tools/timers.hpp vendor/atf/dist/tools/ui.cpp vendor/atf/dist/tools/ui.hpp vendor/atf/dist/tools/ui_test.cpp vendor/atf/dist/tools/user.cpp vendor/atf/dist/tools/user.hpp vendor/atf/dist/tools/user_test.cpp vendor/atf/dist/tools/zero_tcs_helper.c Modified: vendor/atf/dist/INSTALL vendor/atf/dist/Kyuafile vendor/atf/dist/Makefile.am vendor/atf/dist/Makefile.in vendor/atf/dist/NEWS vendor/atf/dist/README 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++/detail/Makefile.am.inc vendor/atf/dist/atf-c/Makefile.am.inc vendor/atf/dist/atf-c/detail/Makefile.am.inc vendor/atf/dist/atf-sh/Makefile.am.inc vendor/atf/dist/bconfig.h.in vendor/atf/dist/bootstrap/Makefile.am.inc 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/test-programs/Makefile.am.inc Modified: vendor/atf/dist/INSTALL ============================================================================== --- vendor/atf/dist/INSTALL Fri Feb 14 14:42:08 2014 (r261887) +++ vendor/atf/dist/INSTALL Fri Feb 14 14:44:03 2014 (r261888) @@ -94,14 +94,6 @@ The most common, standard flags given to Specifies where the program (binaries and all associated files) will be installed. -* --sysconfdir=directory - Possible values: Any path - Default: /usr/local/etc - - Specifies where the installed programs will look for configuration files. - '/atf' will be appended to the given path unless ATF_CONFSUBDIR is - redefined as explained later on. - * --help Shows information about all available flags and exits immediately, without running any configuration tasks. @@ -152,14 +144,6 @@ script: Specifies the C++ compiler flags that ATF will use at run time whenever the build-time-specific checks are used. -* ATF_CONFSUBDIR - Possible values: empty, a relative path. - Default: atf. - - Specifies the subdirectory of the configuration directory (given by the - --sysconfdir argument) under which ATF will search for its configuration - files. - * ATF_SHELL Possible values: empty, absolute path to a POSIX shell interpreter. Default: empty. @@ -177,14 +161,6 @@ script: and work directories for test cases. This is just a default and can be overriden at run time. -* GDB - Possible values: empty, absolute path to GNU GDB. - Default: empty. - - Specifies the path to the GNU GDB binary that atf-run will use to gather - a stack trace of a crashing test program. If empty, the configure script - will try to find a suitable binary for you. - The following flags are specific to ATF's 'configure' script: * --enable-developer @@ -199,25 +175,6 @@ The following flags are specific to ATF' detection features regardless of the value of this flag. However, such warnings are only fatal when --enable-developer is 'yes'. -* --enable-tools - Possible values: yes, no - Default: no. - - Enables the build of the deprecated atf-config, atf-report, atf-run - and atf-version tools. atf-report and atf-run have been superseded by - Kyua, and atf-config and atf-version are unnecessary. - - -Post-installation steps -*********************** - -After installing ATF, you have to register the DTDs it provides into the -system-wide XML catalog. See the comments at the top of the files in -${datadir}/share/xml/atf to see the correct public identifiers. This -directory will typically be /usr/local/share/xml/atf or /usr/share/xml/atf. -Failure to do so will lead to further errors when processing the XML files -generated by atf-report. - =========================================================================== vim: filetype=text:textwidth=75:expandtab:shiftwidth=2:softtabstop=2 Modified: vendor/atf/dist/Kyuafile ============================================================================== --- vendor/atf/dist/Kyuafile Fri Feb 14 14:42:08 2014 (r261887) +++ vendor/atf/dist/Kyuafile Fri Feb 14 14:44:03 2014 (r261888) @@ -6,7 +6,3 @@ include("atf-c/Kyuafile") include("atf-c++/Kyuafile") include("atf-sh/Kyuafile") include("test-programs/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 14:42:08 2014 (r261887) +++ vendor/atf/dist/Makefile.am Fri Feb 14 14:44:03 2014 (r261888) @@ -30,7 +30,6 @@ atf_aclocal_DATA = BUILT_SOURCES = CLEANFILES = -DIST_HOOKS = EXTRA_DIST = bin_PROGRAMS = dist_man_MANS = @@ -54,10 +53,6 @@ include bootstrap/Makefile.am.inc include doc/Makefile.am.inc include test-programs/Makefile.am.inc -if ENABLE_TOOLS -include tools/Makefile.am.inc -endif - # # Top-level distfile documents. # @@ -76,32 +71,9 @@ TESTS_ENVIRONMENT = PATH=$(prefix)/bin:$ testsdir = $(exec_prefix)/tests pkgtestsdir = $(testsdir)/$(PACKAGE) -if ENABLE_TOOLS -INSTALLCHECK_TARGETS += installcheck-atf -PHONY_TARGETS += installcheck-atf -installcheck-atf: - logfile=$$(pwd)/installcheck.log; \ - fifofile=$$(pwd)/installcheck.fifo; \ - cd $(pkgtestsdir); \ - rm -f $${fifofile}; \ - mkfifo $${fifofile}; \ - cat $${fifofile} | tee $${logfile} | $(TESTS_ENVIRONMENT) atf-report & \ - $(TESTS_ENVIRONMENT) atf-run >>$${fifofile}; \ - res=$${?}; \ - wait; \ - rm $${fifofile}; \ - echo; \ - echo "The verbatim output of atf-run has been saved to" \ - "installcheck.log; exit was $${res}"; \ - test $${res} -eq 0 -CLEANFILES += installcheck.fifo installcheck.log -endif - PHONY_TARGETS += installcheck-kyua if HAVE_KYUA -if !ENABLE_TOOLS INSTALLCHECK_TARGETS += installcheck-kyua -endif installcheck-kyua: cd $(pkgtestsdir) && $(TESTS_ENVIRONMENT) $(KYUA) test endif @@ -109,9 +81,6 @@ endif installcheck-local: $(INSTALLCHECK_TARGETS) pkgtests_DATA = Kyuafile -if ENABLE_TOOLS -pkgtests_DATA += Atffile -endif EXTRA_DIST += $(pkgtests_DATA) BUILD_SH_TP = \ @@ -124,17 +93,6 @@ BUILD_SH_TP = \ # Custom targets. # -DIST_HOOKS += forbid-dist -if ENABLE_TOOLS -forbid-dist: - @true -else -forbid-dist: - @echo "Sorry; cannot make dist without the tools enabled." - @echo "Please reconfigure with --enable-tools." - @false -endif - PHONY_TARGETS += clean-all clean-all: GIT="$(GIT)" $(SH) $(srcdir)/admin/clean-all.sh @@ -149,6 +107,4 @@ 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 14:42:08 2014 (r261887) +++ vendor/atf/dist/Makefile.in Fri Feb 14 14:44:03 2014 (r261888) @@ -304,36 +304,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. -# - - @@ -403,7 +373,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = atf-sh/atf-sh$(EXEEXT) $(am__EXEEXT_1) +bin_PROGRAMS = atf-sh/atf-sh$(EXEEXT) libexec_PROGRAMS = atf-sh/atf-check$(EXEEXT) DIST_COMMON = $(srcdir)/admin/Makefile.am.inc \ $(srcdir)/atf-c/Makefile.am.inc \ @@ -413,17 +383,16 @@ DIST_COMMON = $(srcdir)/admin/Makefile.a $(srcdir)/atf-sh/Makefile.am.inc \ $(srcdir)/bootstrap/Makefile.am.inc \ $(srcdir)/doc/Makefile.am.inc \ - $(srcdir)/test-programs/Makefile.am.inc \ - $(srcdir)/tools/Makefile.am.inc $(srcdir)/Makefile.in \ + $(srcdir)/test-programs/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)/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)/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/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 tests_atf_c_PROGRAMS = atf-c/atf_c_test$(EXEEXT) \ @@ -454,67 +423,11 @@ tests_atf_c___detail_PROGRAMS = \ atf-c++/detail/sanity_test$(EXEEXT) \ atf-c++/detail/text_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) \ +check_PROGRAMS = bootstrap/h_tp_basic_c$(EXEEXT) \ bootstrap/h_tp_basic_cpp$(EXEEXT) tests_test_programs_PROGRAMS = test-programs/c_helpers$(EXEEXT) \ test-programs/cpp_helpers$(EXEEXT) - -# XXX For some reason, the nodist line above does not work as expected. -# Work this problem around. -@ENABLE_TOOLS_TRUE@am__append_1 = kill-defs-hpp -@ENABLE_TOOLS_TRUE@am__append_2 = tools/atf-config tools/atf-report \ -@ENABLE_TOOLS_TRUE@ tools/atf-run tools/atf-version -@ENABLE_TOOLS_TRUE@am__append_3 = tools/atf-config.1 \ -@ENABLE_TOOLS_TRUE@ tools/atf-report.1 tools/atf-run.1 \ -@ENABLE_TOOLS_TRUE@ tools/atf-version.1 tools/atf-formats.5 -@ENABLE_TOOLS_TRUE@am__append_4 = tools/generate-revision.sh \ -@ENABLE_TOOLS_TRUE@ tools/atf.7.in $(css_DATA) $(dtd_DATA) \ -@ENABLE_TOOLS_TRUE@ $(eg_DATA) $(hooks_DATA) $(xsl_DATA) \ -@ENABLE_TOOLS_TRUE@ $(tests_tools_DATA) \ -@ENABLE_TOOLS_TRUE@ tools/atf-config_test.sh \ -@ENABLE_TOOLS_TRUE@ tools/atf-report_test.sh \ -@ENABLE_TOOLS_TRUE@ tools/atf-run_test.sh -@ENABLE_TOOLS_TRUE@am__append_5 = tools/revision.h -@ENABLE_TOOLS_TRUE@am__append_6 = tools/revision.h \ -@ENABLE_TOOLS_TRUE@ tools/revision.h.stamp tools/atf.7 \ -@ENABLE_TOOLS_TRUE@ tools/atf-config_test tools/atf-report_test \ -@ENABLE_TOOLS_TRUE@ tools/atf-run_test installcheck.fifo \ -@ENABLE_TOOLS_TRUE@ installcheck.log -@ENABLE_TOOLS_TRUE@am__append_7 = tools/revision.h.stamp \ -@ENABLE_TOOLS_TRUE@ installcheck-atf -@ENABLE_TOOLS_TRUE@am__append_8 = tools/atf.7 -@ENABLE_TOOLS_TRUE@tests_tools_PROGRAMS = \ -@ENABLE_TOOLS_TRUE@ tools/application_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/atffile_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/auto_array_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/bad_metadata_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/config_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/config_file_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/env_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/expand_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/expect_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/fail_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/fs_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/io_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/misc_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/parser_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/process_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/pass_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/process_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/reader_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/requirements_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/several_tcs_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/signals_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/test_program_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/text_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/ui_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/user_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/zero_tcs_helper$(EXEEXT) -@ENABLE_TOOLS_TRUE@am__append_9 = installcheck-atf -@ENABLE_TOOLS_FALSE@@HAVE_KYUA_TRUE@am__append_10 = installcheck-kyua -@ENABLE_TOOLS_TRUE@am__append_11 = Atffile +@HAVE_KYUA_TRUE@am__append_1 = installcheck-kyua subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler-flags.m4 \ @@ -524,61 +437,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/c $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(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-signals.m4 \ - $(top_srcdir)/m4/runtime-tool.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/module-fs.m4 $(top_srcdir)/m4/runtime-tool.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = bconfig.h -CONFIG_CLEAN_FILES = atf-c/defs.h tools/defs.hpp +CONFIG_CLEAN_FILES = atf-c/defs.h CONFIG_CLEAN_VPATH_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -AM_V_AR = $(am__v_AR_@AM_V@) -am__v_AR_ = $(am__v_AR_@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 -@ENABLE_TOOLS_TRUE@am_tools_libtools_a_OBJECTS = tools/tools_libtools_a-application.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-atffile.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-config.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-config_file.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-env.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-exceptions.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-expand.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-fs.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-io.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-parser.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-process.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-reader.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-requirements.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-signals.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-test-program.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-text.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-timers.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-ui.$(OBJEXT) \ -@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/||"`;; \ @@ -612,29 +480,24 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(tests_atf_c___detaildir)" \ "$(DESTDIR)$(tests_atf_c_detaildir)" \ "$(DESTDIR)$(tests_test_programsdir)" \ - "$(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)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" \ + "$(DESTDIR)$(tests_atf_shdir)" \ + "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" \ - "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" \ "$(DESTDIR)$(atf_aclocaldir)" \ "$(DESTDIR)$(atf_c__dirpkgconfigdir)" \ "$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" \ - "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(cssdir)" \ - "$(DESTDIR)$(docdir)" "$(DESTDIR)$(dtddir)" \ - "$(DESTDIR)$(egdir)" "$(DESTDIR)$(hooksdir)" \ + "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(docdir)" \ "$(DESTDIR)$(pkgtestsdir)" "$(DESTDIR)$(tests_atf_cdir)" \ "$(DESTDIR)$(tests_atf_c__dir)" \ "$(DESTDIR)$(tests_atf_c___detaildir)" \ "$(DESTDIR)$(tests_atf_c_detaildir)" \ "$(DESTDIR)$(tests_atf_shdir)" \ - "$(DESTDIR)$(tests_test_programsdir)" \ - "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(xsldir)" \ - "$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" \ - "$(DESTDIR)$(includedir)" + "$(DESTDIR)$(tests_test_programsdir)" "$(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 = \ @@ -679,14 +542,9 @@ 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 $@ -@ENABLE_TOOLS_TRUE@am__EXEEXT_1 = tools/atf-config$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/atf-report$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/atf-run$(EXEEXT) \ -@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_test_programs_PROGRAMS) \ - $(tests_tools_PROGRAMS) + $(tests_atf_c_detail_PROGRAMS) $(tests_test_programs_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 \ @@ -860,15 +718,6 @@ atf_sh_atf_check_DEPENDENCIES = $(ATF_CX 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_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 = 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 = 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 @@ -887,179 +736,8 @@ 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 -@ENABLE_TOOLS_TRUE@am_tools_application_test_OBJECTS = tools/tools_application_test-application_test.$(OBJEXT) -tools_application_test_OBJECTS = $(am_tools_application_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_application_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) -am__tools_atf_config_SOURCES_DIST = tools/atf-config.cpp -@ENABLE_TOOLS_TRUE@am_tools_atf_config_OBJECTS = tools/tools_atf_config-atf-config.$(OBJEXT) -tools_atf_config_OBJECTS = $(am_tools_atf_config_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_atf_config_DEPENDENCIES = $(TOOLS_LDADD) -am__tools_atf_report_SOURCES_DIST = tools/atf-report.cpp -@ENABLE_TOOLS_TRUE@am_tools_atf_report_OBJECTS = tools/tools_atf_report-atf-report.$(OBJEXT) -tools_atf_report_OBJECTS = $(am_tools_atf_report_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_atf_report_DEPENDENCIES = $(TOOLS_LDADD) -am__tools_atf_run_SOURCES_DIST = tools/atf-run.cpp -@ENABLE_TOOLS_TRUE@am_tools_atf_run_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_atf_run-atf-run.$(OBJEXT) -tools_atf_run_OBJECTS = $(am_tools_atf_run_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_atf_run_DEPENDENCIES = $(TOOLS_LDADD) -am__tools_atf_version_SOURCES_DIST = tools/atf-version.cpp -@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) -@ENABLE_TOOLS_TRUE@tools_atf_version_DEPENDENCIES = $(TOOLS_LDADD) -am__tools_atffile_test_SOURCES_DIST = tools/atffile_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_atffile_test_OBJECTS = tools/tools_atffile_test-atffile_test.$(OBJEXT) -tools_atffile_test_OBJECTS = $(am_tools_atffile_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_atffile_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_auto_array_test_SOURCES_DIST = tools/auto_array_test.cpp -@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) -@ENABLE_TOOLS_TRUE@tools_auto_array_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) -am__tools_bad_metadata_helper_SOURCES_DIST = \ - tools/bad_metadata_helper.c -@ENABLE_TOOLS_TRUE@am_tools_bad_metadata_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/bad_metadata_helper.$(OBJEXT) -tools_bad_metadata_helper_OBJECTS = \ - $(am_tools_bad_metadata_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_bad_metadata_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ libatf-c.la -am__tools_config_file_test_SOURCES_DIST = tools/config_file_test.cpp -@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) -@ENABLE_TOOLS_TRUE@tools_config_file_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) -am__tools_config_test_SOURCES_DIST = tools/config_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_config_test_OBJECTS = tools/tools_config_test-config_test.$(OBJEXT) -tools_config_test_OBJECTS = $(am_tools_config_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_config_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_env_test_SOURCES_DIST = tools/env_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_env_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_env_test-env_test.$(OBJEXT) -tools_env_test_OBJECTS = $(am_tools_env_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_env_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_expand_test_SOURCES_DIST = tools/expand_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_expand_test_OBJECTS = tools/tools_expand_test-expand_test.$(OBJEXT) -tools_expand_test_OBJECTS = $(am_tools_expand_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_expand_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_expect_helpers_SOURCES_DIST = tools/expect_helpers.c -@ENABLE_TOOLS_TRUE@am_tools_expect_helpers_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/expect_helpers.$(OBJEXT) -tools_expect_helpers_OBJECTS = $(am_tools_expect_helpers_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_expect_helpers_DEPENDENCIES = libatf-c.la -am__tools_fail_helper_SOURCES_DIST = tools/fail_helper.cpp -@ENABLE_TOOLS_TRUE@am_tools_fail_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/fail_helper.$(OBJEXT) -tools_fail_helper_OBJECTS = $(am_tools_fail_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_fail_helper_DEPENDENCIES = $(ATF_CXX_LIBS) -am__tools_fs_test_SOURCES_DIST = tools/fs_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_fs_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_fs_test-fs_test.$(OBJEXT) -tools_fs_test_OBJECTS = $(am_tools_fs_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_fs_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_io_test_SOURCES_DIST = tools/io_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_io_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_io_test-io_test.$(OBJEXT) -tools_io_test_OBJECTS = $(am_tools_io_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_io_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_misc_helpers_SOURCES_DIST = tools/misc_helpers.cpp -@ENABLE_TOOLS_TRUE@am_tools_misc_helpers_OBJECTS = tools/tools_misc_helpers-misc_helpers.$(OBJEXT) -tools_misc_helpers_OBJECTS = $(am_tools_misc_helpers_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_misc_helpers_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_parser_test_SOURCES_DIST = tools/parser_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_parser_test_OBJECTS = tools/tools_parser_test-parser_test.$(OBJEXT) -tools_parser_test_OBJECTS = $(am_tools_parser_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_parser_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_pass_helper_SOURCES_DIST = tools/pass_helper.cpp -@ENABLE_TOOLS_TRUE@am_tools_pass_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/pass_helper.$(OBJEXT) -tools_pass_helper_OBJECTS = $(am_tools_pass_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_pass_helper_DEPENDENCIES = $(ATF_CXX_LIBS) -am__tools_process_helpers_SOURCES_DIST = tools/process_helpers.c -@ENABLE_TOOLS_TRUE@am_tools_process_helpers_OBJECTS = \ -@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 -@ENABLE_TOOLS_TRUE@am_tools_process_test_OBJECTS = tools/tools_process_test-process_test.$(OBJEXT) -tools_process_test_OBJECTS = $(am_tools_process_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_process_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_reader_test_SOURCES_DIST = tools/reader_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_reader_test_OBJECTS = tools/tools_reader_test-reader_test.$(OBJEXT) -tools_reader_test_OBJECTS = $(am_tools_reader_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_reader_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_requirements_test_SOURCES_DIST = \ - tools/requirements_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_requirements_test_OBJECTS = tools/tools_requirements_test-requirements_test.$(OBJEXT) -tools_requirements_test_OBJECTS = \ - $(am_tools_requirements_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_requirements_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) -am__tools_several_tcs_helper_SOURCES_DIST = \ - tools/several_tcs_helper.c -@ENABLE_TOOLS_TRUE@am_tools_several_tcs_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/several_tcs_helper.$(OBJEXT) -tools_several_tcs_helper_OBJECTS = \ - $(am_tools_several_tcs_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_several_tcs_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ libatf-c.la -am__tools_signals_test_SOURCES_DIST = tools/signals_test.cpp \ - tools/signals.cpp -@ENABLE_TOOLS_TRUE@am_tools_signals_test_OBJECTS = tools/tools_signals_test-signals_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_signals_test-signals.$(OBJEXT) -tools_signals_test_OBJECTS = $(am_tools_signals_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_signals_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_test_program_test_SOURCES_DIST = \ - tools/test_program_test.cpp -@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) -@ENABLE_TOOLS_TRUE@tools_test_program_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) -am__tools_text_test_SOURCES_DIST = tools/text_test.cpp tools/text.cpp -@ENABLE_TOOLS_TRUE@am_tools_text_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_text_test-text_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_text_test-text.$(OBJEXT) -tools_text_test_OBJECTS = $(am_tools_text_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_text_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_ui_test_SOURCES_DIST = tools/ui_test.cpp tools/ui.cpp -@ENABLE_TOOLS_TRUE@am_tools_ui_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_ui_test-ui_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_ui_test-ui.$(OBJEXT) -tools_ui_test_OBJECTS = $(am_tools_ui_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_ui_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_user_test_SOURCES_DIST = tools/user_test.cpp tools/user.cpp -@ENABLE_TOOLS_TRUE@am_tools_user_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_user_test-user_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_user_test-user.$(OBJEXT) -tools_user_test_OBJECTS = $(am_tools_user_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_user_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_zero_tcs_helper_SOURCES_DIST = tools/zero_tcs_helper.c -@ENABLE_TOOLS_TRUE@am_tools_zero_tcs_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/zero_tcs_helper.$(OBJEXT) -tools_zero_tcs_helper_OBJECTS = $(am_tools_zero_tcs_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_zero_tcs_helper_DEPENDENCIES = libatf-c.la SCRIPTS = $(tests_atf_c_SCRIPTS) $(tests_atf_c___SCRIPTS) \ - $(tests_atf_sh_SCRIPTS) $(tests_test_programs_SCRIPTS) \ - $(tests_tools_SCRIPTS) + $(tests_atf_sh_SCRIPTS) $(tests_test_programs_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -1112,9 +790,7 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(tools_libtools_a_SOURCES) \ - $(nodist_tools_libtools_a_SOURCES) \ - $(atf_c___detail_libtest_helpers_la_SOURCES) \ +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) \ @@ -1147,33 +823,11 @@ SOURCES = $(tools_libtools_a_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) \ + $(atf_sh_atf_sh_SOURCES) $(bootstrap_h_tp_basic_c_SOURCES) \ $(bootstrap_h_tp_basic_cpp_SOURCES) \ $(test_programs_c_helpers_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) \ + $(test_programs_cpp_helpers_SOURCES) +DIST_SOURCES = $(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) \ @@ -1205,42 +859,10 @@ DIST_SOURCES = $(am__tools_libtools_a_SO $(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) \ + $(atf_sh_atf_sh_SOURCES) $(bootstrap_h_tp_basic_c_SOURCES) \ $(bootstrap_h_tp_basic_cpp_SOURCES) \ $(test_programs_c_helpers_SOURCES) \ - $(test_programs_cpp_helpers_SOURCES) \ - $(am__tools_application_test_SOURCES_DIST) \ - $(am__tools_atf_config_SOURCES_DIST) \ - $(am__tools_atf_report_SOURCES_DIST) \ - $(am__tools_atf_run_SOURCES_DIST) \ - $(am__tools_atf_version_SOURCES_DIST) \ - $(am__tools_atffile_test_SOURCES_DIST) \ - $(am__tools_auto_array_test_SOURCES_DIST) \ - $(am__tools_bad_metadata_helper_SOURCES_DIST) \ - $(am__tools_config_file_test_SOURCES_DIST) \ - $(am__tools_config_test_SOURCES_DIST) \ - $(am__tools_env_test_SOURCES_DIST) \ - $(am__tools_expand_test_SOURCES_DIST) \ - $(am__tools_expect_helpers_SOURCES_DIST) \ - $(am__tools_fail_helper_SOURCES_DIST) \ - $(am__tools_fs_test_SOURCES_DIST) \ - $(am__tools_io_test_SOURCES_DIST) \ - $(am__tools_misc_helpers_SOURCES_DIST) \ - $(am__tools_parser_test_SOURCES_DIST) \ - $(am__tools_pass_helper_SOURCES_DIST) \ - $(am__tools_process_helpers_SOURCES_DIST) \ - $(am__tools_process_test_SOURCES_DIST) \ - $(am__tools_reader_test_SOURCES_DIST) \ - $(am__tools_requirements_test_SOURCES_DIST) \ - $(am__tools_several_tcs_helper_SOURCES_DIST) \ - $(am__tools_signals_test_SOURCES_DIST) \ - $(am__tools_test_program_test_SOURCES_DIST) \ - $(am__tools_text_test_SOURCES_DIST) \ - $(am__tools_ui_test_SOURCES_DIST) \ - $(am__tools_user_test_SOURCES_DIST) \ - $(am__tools_zero_tcs_helper_SOURCES_DIST) + $(test_programs_cpp_helpers_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -1249,17 +871,14 @@ am__can_run_installinfo = \ man1dir = $(mandir)/man1 man3dir = $(mandir)/man3 man4dir = $(mandir)/man4 -man5dir = $(mandir)/man5 -man7dir = $(mandir)/man7 NROFF = nroff MANS = $(dist_man_MANS) $(man_MANS) DATA = $(atf_aclocal_DATA) $(atf_c__dirpkgconfig_DATA) \ $(atf_cpkgconfig_DATA) $(atf_sh_DATA) $(atf_shpkgconfig_DATA) \ - $(css_DATA) $(doc_DATA) $(dtd_DATA) $(eg_DATA) $(hooks_DATA) \ - $(noinst_DATA) $(pkgtests_DATA) $(tests_atf_c_DATA) \ - $(tests_atf_c___DATA) $(tests_atf_c___detail_DATA) \ - $(tests_atf_c_detail_DATA) $(tests_atf_sh_DATA) \ - $(tests_test_programs_DATA) $(tests_tools_DATA) $(xsl_DATA) + $(doc_DATA) $(noinst_DATA) $(pkgtests_DATA) \ + $(tests_atf_c_DATA) $(tests_atf_c___DATA) \ + $(tests_atf_c___detail_DATA) $(tests_atf_c_detail_DATA) \ + $(tests_atf_sh_DATA) $(tests_test_programs_DATA) HEADERS = $(atf_c_HEADERS) $(atf_c___HEADERS) $(include_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)bconfig.h.in @@ -1310,7 +929,6 @@ ATF_BUILD_CPP = @ATF_BUILD_CPP@ ATF_BUILD_CPPFLAGS = @ATF_BUILD_CPPFLAGS@ ATF_BUILD_CXX = @ATF_BUILD_CXX@ ATF_BUILD_CXXFLAGS = @ATF_BUILD_CXXFLAGS@ -ATF_CONFSUBDIR = @ATF_CONFSUBDIR@ ATF_SHELL = @ATF_SHELL@ ATF_WORKDIR = @ATF_WORKDIR@ ATTRIBUTE_FORMAT_PRINTF = @ATTRIBUTE_FORMAT_PRINTF@ @@ -1339,10 +957,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENABLE_TOOLS = @ENABLE_TOOLS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GDB = @GDB@ GIT = @GIT@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -1396,14 +1012,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ atf_aclocaldir = @atf_aclocaldir@ -atf_arch = @atf_arch@ -atf_confdir = @atf_confdir@ -atf_cssdir = @atf_cssdir@ -atf_dtddir = @atf_dtddir@ -atf_egdir = @atf_egdir@ -atf_machine = @atf_machine@ atf_pkgconfigdir = @atf_pkgconfigdir@ -atf_xsldir = @atf_xsldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -1451,7 +1060,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ atf_aclocal_DATA = atf-c/atf-common.m4 atf-c/atf-c.m4 \ atf-c++/atf-c++.m4 atf-sh/atf-sh.m4 -BUILT_SOURCES = $(am__append_5) +BUILT_SOURCES = CLEANFILES = atf-c/atf-c.pc atf-c/pkg_config_test atf-c++/atf-c++.pc \ atf-c++/pkg_config_test atf-sh/atf-sh.pc atf-sh/misc_helpers \ atf-sh/atf_check_test atf-sh/atf-check_test atf-sh/config_test \ @@ -1461,15 +1070,7 @@ CLEANFILES = atf-c/atf-c.pc atf-c/pkg_co bootstrap/h_tp_pass test-programs/sh_helpers \ test-programs/config_test test-programs/expect_test \ test-programs/meta_data_test test-programs/result_test \ - test-programs/srcdir_test $(am__append_6) - -# XXX For some reason, the nodist line above does not work as expected. -# Work this problem around. - -# -# Custom targets. -# -DIST_HOOKS = kill-defs-h $(am__append_1) forbid-dist + test-programs/srcdir_test EXTRA_DIST = admin/check-style-common.awk admin/check-style-c.awk \ admin/check-style-cpp.awk admin/check-style-man.awk \ admin/check-style-shell.awk admin/check-style.sh \ @@ -1491,20 +1092,23 @@ EXTRA_DIST = admin/check-style-common.aw test-programs/sh_helpers.sh test-programs/config_test.sh \ test-programs/expect_test.sh test-programs/meta_data_test.sh \ test-programs/result_test.sh test-programs/srcdir_test.sh \ - $(am__append_4) $(doc_DATA) INSTALL README $(pkgtests_DATA) + $(doc_DATA) INSTALL README $(pkgtests_DATA) dist_man_MANS = atf-c/atf-c-api.3 atf-c++/atf-c++-api.3 \ atf-sh/atf-check.1 atf-sh/atf-sh.1 atf-sh/atf-sh-api.3 \ - doc/atf-test-case.4 doc/atf-test-program.1 $(am__append_3) + doc/atf-test-case.4 doc/atf-test-program.1 include_HEADERS = atf-c.h atf-c++.hpp lib_LTLIBRARIES = libatf-c.la libatf-c++.la -man_MANS = $(am__append_8) +man_MANS = noinst_DATA = INSTALL README noinst_LTLIBRARIES = atf-c/detail/libtest_helpers.la \ atf-c++/detail/libtest_helpers.la -INSTALLCHECK_TARGETS = installcheck-bootstrap $(am__append_9) \ - $(am__append_10) -PHONY_TARGETS = check-style installcheck-bootstrap $(am__append_7) \ - installcheck-kyua clean-all release release-test +INSTALLCHECK_TARGETS = installcheck-bootstrap $(am__append_1) + +# +# Custom targets. +# +PHONY_TARGETS = check-style installcheck-bootstrap installcheck-kyua \ + clean-all release release-test ACLOCAL_AMFLAGS = -I m4 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tools libatf_c_la_SOURCES = atf-c/build.c atf-c/build.h atf-c/check.c \ @@ -1546,8 +1150,7 @@ atf_c_HEADERS = atf-c/build.h \ atf_cdir = $(includedir)/atf-c atf_cpkgconfigdir = $(atf_pkgconfigdir) atf_cpkgconfig_DATA = atf-c/atf-c.pc -tests_atf_c_DATA = atf-c/Atffile \ - atf-c/Kyuafile \ +tests_atf_c_DATA = atf-c/Kyuafile \ atf-c/macros_h_test.c \ atf-c/unused_test.c @@ -1571,9 +1174,7 @@ atf_c_tp_test_SOURCES = atf-c/tp_test.c atf_c_tp_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la atf_c_utils_test_SOURCES = atf-c/utils_test.c atf-c/h_build.h atf_c_utils_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la -tests_atf_c_detail_DATA = atf-c/detail/Atffile \ - atf-c/detail/Kyuafile - +tests_atf_c_detail_DATA = atf-c/detail/Kyuafile tests_atf_c_detaildir = $(pkgtestsdir)/atf-c/detail atf_c_detail_libtest_helpers_la_SOURCES = atf-c/detail/test_helpers.c \ atf-c/detail/test_helpers.h @@ -1623,8 +1224,7 @@ atf_c___HEADERS = atf-c++/build.hpp \ atf_c__dir = $(includedir)/atf-c++ atf_c__dirpkgconfigdir = $(atf_pkgconfigdir) atf_c__dirpkgconfig_DATA = atf-c++/atf-c++.pc -tests_atf_c___DATA = atf-c++/Atffile \ - atf-c++/Kyuafile \ +tests_atf_c___DATA = atf-c++/Kyuafile \ atf-c++/macros_hpp_test.cpp \ atf-c++/unused_test.cpp @@ -1644,9 +1244,7 @@ atf_c___tests_test_SOURCES = atf-c++/tes atf_c___tests_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___utils_test_SOURCES = atf-c++/utils_test.cpp atf_c___utils_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -tests_atf_c___detail_DATA = atf-c++/detail/Atffile \ - atf-c++/detail/Kyuafile - +tests_atf_c___detail_DATA = atf-c++/detail/Kyuafile tests_atf_c___detaildir = $(pkgtestsdir)/atf-c++/detail atf_c___detail_libtest_helpers_la_SOURCES = atf-c++/detail/test_helpers.cpp \ atf-c++/detail/test_helpers.hpp @@ -1676,18 +1274,12 @@ atf_sh_DATA = atf-sh/libatf-sh.subr atf_shdir = $(pkgdatadir) atf_shpkgconfigdir = $(atf_pkgconfigdir) atf_shpkgconfig_DATA = atf-sh/atf-sh.pc -tests_atf_sh_DATA = atf-sh/Atffile \ - atf-sh/Kyuafile - +tests_atf_sh_DATA = atf-sh/Kyuafile tests_atf_shdir = $(pkgtestsdir)/atf-sh tests_atf_sh_SCRIPTS = atf-sh/misc_helpers atf-sh/atf_check_test \ atf-sh/atf-check_test atf-sh/config_test \ atf-sh/integration_test atf-sh/normalize_test atf-sh/tc_test \ atf-sh/tp_test -bootstrap_h_app_empty_SOURCES = bootstrap/h_app_empty.cpp -bootstrap_h_app_empty_LDADD = tools/libtools.a $(ATF_CXX_LIBS) -bootstrap_h_app_opts_args_SOURCES = bootstrap/h_app_opts_args.cpp -bootstrap_h_app_opts_args_LDADD = tools/libtools.a $(ATF_CXX_LIBS) bootstrap_h_tp_basic_c_SOURCES = bootstrap/h_tp_basic_c.c bootstrap_h_tp_basic_c_LDADD = libatf-c.la bootstrap_h_tp_basic_cpp_SOURCES = bootstrap/h_tp_basic_cpp.cpp @@ -1699,19 +1291,13 @@ DISTCLEANFILES = \ testsuite.lineno \ testsuite.log -testsuite_incs = $(srcdir)/bootstrap/t_application_help.at \ - $(srcdir)/bootstrap/t_application_opts_args.at \ - $(srcdir)/bootstrap/t_atf_config.at \ - $(srcdir)/bootstrap/t_atf_run.at \ - $(srcdir)/bootstrap/t_subr_atf_check.at \ +testsuite_incs = $(srcdir)/bootstrap/t_subr_atf_check.at \ $(srcdir)/bootstrap/t_test_program_compare.at \ $(srcdir)/bootstrap/t_test_program_filter.at \ $(srcdir)/bootstrap/t_test_program_list.at \ $(srcdir)/bootstrap/t_test_program_run.at -tests_test_programs_DATA = test-programs/Atffile \ - test-programs/Kyuafile - +tests_test_programs_DATA = test-programs/Kyuafile tests_test_programsdir = $(pkgtestsdir)/test-programs test_programs_c_helpers_SOURCES = test-programs/c_helpers.c test_programs_c_helpers_LDADD = libatf-c.la @@ -1722,166 +1308,6 @@ tests_test_programs_SCRIPTS = test-progr test-programs/config_test test-programs/expect_test \ test-programs/meta_data_test test-programs/result_test \ test-programs/srcdir_test -@ENABLE_TOOLS_TRUE@TOOLS_CPPFLAGS = -I$(top_srcdir)/tools -I$(top_builddir)/tools -@ENABLE_TOOLS_TRUE@TOOLS_LDADD = tools/libtools.a -@ENABLE_TOOLS_TRUE@noinst_LIBRARIES = tools/libtools.a -@ENABLE_TOOLS_TRUE@tools_libtools_a_SOURCES = tools/application.cpp \ -@ENABLE_TOOLS_TRUE@ tools/application.hpp \ -@ENABLE_TOOLS_TRUE@ tools/atffile.cpp \ -@ENABLE_TOOLS_TRUE@ tools/atffile.hpp \ -@ENABLE_TOOLS_TRUE@ tools/auto_array.hpp \ -@ENABLE_TOOLS_TRUE@ tools/config.cpp \ -@ENABLE_TOOLS_TRUE@ tools/config.hpp \ -@ENABLE_TOOLS_TRUE@ tools/config_file.cpp \ -@ENABLE_TOOLS_TRUE@ tools/config_file.hpp \ -@ENABLE_TOOLS_TRUE@ tools/env.cpp \ -@ENABLE_TOOLS_TRUE@ tools/env.hpp \ -@ENABLE_TOOLS_TRUE@ tools/exceptions.cpp \ -@ENABLE_TOOLS_TRUE@ tools/exceptions.hpp \ -@ENABLE_TOOLS_TRUE@ tools/expand.cpp \ -@ENABLE_TOOLS_TRUE@ tools/expand.hpp \ -@ENABLE_TOOLS_TRUE@ tools/fs.cpp \ -@ENABLE_TOOLS_TRUE@ tools/fs.hpp \ -@ENABLE_TOOLS_TRUE@ tools/io.cpp \ -@ENABLE_TOOLS_TRUE@ tools/io.hpp \ -@ENABLE_TOOLS_TRUE@ tools/parser.cpp \ -@ENABLE_TOOLS_TRUE@ tools/parser.hpp \ -@ENABLE_TOOLS_TRUE@ tools/process.cpp \ -@ENABLE_TOOLS_TRUE@ tools/process.hpp \ -@ENABLE_TOOLS_TRUE@ tools/reader.cpp \ -@ENABLE_TOOLS_TRUE@ tools/reader.hpp \ -@ENABLE_TOOLS_TRUE@ tools/requirements.cpp \ -@ENABLE_TOOLS_TRUE@ tools/requirements.hpp \ -@ENABLE_TOOLS_TRUE@ tools/signals.cpp \ -@ENABLE_TOOLS_TRUE@ tools/signals.hpp \ -@ENABLE_TOOLS_TRUE@ tools/test-program.cpp \ -@ENABLE_TOOLS_TRUE@ tools/test-program.hpp \ -@ENABLE_TOOLS_TRUE@ tools/test_helpers.hpp \ -@ENABLE_TOOLS_TRUE@ tools/text.cpp \ -@ENABLE_TOOLS_TRUE@ tools/text.hpp \ -@ENABLE_TOOLS_TRUE@ tools/timers.cpp \ -@ENABLE_TOOLS_TRUE@ tools/timers.hpp \ -@ENABLE_TOOLS_TRUE@ tools/ui.cpp \ -@ENABLE_TOOLS_TRUE@ tools/ui.hpp \ -@ENABLE_TOOLS_TRUE@ tools/user.cpp \ -@ENABLE_TOOLS_TRUE@ tools/user.hpp - -@ENABLE_TOOLS_TRUE@nodist_tools_libtools_a_SOURCES = tools/defs.hpp -@ENABLE_TOOLS_TRUE@tools_libtools_a_CPPFLAGS = "-DATF_ARCH=\"$(atf_arch)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CFLAGS=\"$(ATF_BUILD_CFLAGS)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CPP=\"$(ATF_BUILD_CPP)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CPPFLAGS=\"$(ATF_BUILD_CPPFLAGS)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CXX=\"$(ATF_BUILD_CXX)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_CONFDIR=\"$(atf_confdir)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_INCLUDEDIR=\"$(includedir)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_LIBDIR=\"$(libdir)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_LIBEXECDIR=\"$(libexecdir)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_MACHINE=\"$(atf_machine)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_PKGDATADIR=\"$(pkgdatadir)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_SHELL=\"$(ATF_SHELL)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_CPPFLAGS) - -@ENABLE_TOOLS_TRUE@tools_atf_config_SOURCES = tools/atf-config.cpp -@ENABLE_TOOLS_TRUE@tools_atf_config_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_atf_config_LDADD = $(TOOLS_LDADD) -@ENABLE_TOOLS_TRUE@tools_atf_report_SOURCES = tools/atf-report.cpp -@ENABLE_TOOLS_TRUE@tools_atf_report_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_atf_report_LDADD = $(TOOLS_LDADD) -@ENABLE_TOOLS_TRUE@tools_atf_run_CPPFLAGS = $(TOOLS_CPPFLAGS) "-DGDB=\"$(GDB)\"" -@ENABLE_TOOLS_TRUE@tools_atf_run_SOURCES = tools/atf-run.cpp -@ENABLE_TOOLS_TRUE@tools_atf_run_LDADD = $(TOOLS_LDADD) -@ENABLE_TOOLS_TRUE@tools_atf_version_SOURCES = tools/atf-version.cpp -@ENABLE_TOOLS_TRUE@nodist_tools_atf_version_SOURCES = tools/revision.h -@ENABLE_TOOLS_TRUE@tools_atf_version_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_atf_version_LDADD = $(TOOLS_LDADD) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Fri Feb 14 14:44:34 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E44E2985; Fri, 14 Feb 2014 14:44:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B56FB1F6B; Fri, 14 Feb 2014 14:44:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EEiY3R077574; Fri, 14 Feb 2014 14:44:34 GMT (envelope-from jmmv@svn.freebsd.org) Received: (from jmmv@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EEiYdt077573; Fri, 14 Feb 2014 14:44:34 GMT (envelope-from jmmv@svn.freebsd.org) Message-Id: <201402141444.s1EEiYdt077573@svn.freebsd.org> From: Julio Merino Date: Fri, 14 Feb 2014 14:44:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r261889 - vendor/atf/atf-0.20 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 14:44:35 -0000 Author: jmmv Date: Fri Feb 14 14:44:34 2014 New Revision: 261889 URL: http://svnweb.freebsd.org/changeset/base/261889 Log: Tag import of atf-0.20. Added: vendor/atf/atf-0.20/ - copied from r261888, vendor/atf/dist/