head	1.2;
access;
symbols
	perseant-exfatfs-base-20250801:1.2
	perseant-exfatfs-base-20240630:1.2
	perseant-exfatfs:1.2.0.6
	perseant-exfatfs-base:1.2
	cjep_sun2x:1.2.0.4
	cjep_sun2x-base:1.2
	cjep_staticlib_x-base1:1.2
	cjep_staticlib_x:1.2.0.2
	cjep_staticlib_x-base:1.2
	phil-wifi-20200421:1.2
	phil-wifi-20200411:1.2
	phil-wifi-20200406:1.2
	pgoyette-compat-merge-20190127:1.1.1.1.2.3
	pgoyette-compat-20190127:1.2
	pgoyette-compat-20190118:1.2
	pgoyette-compat-1226:1.1.1.1
	pgoyette-compat-1126:1.1.1.1
	pgoyette-compat-1020:1.1.1.1
	pgoyette-compat-0930:1.1.1.1
	pgoyette-compat:1.1.1.1.0.2
	pgoyette-compat-0906:1.1.1.1
	bind-9-12-2-P1:1.1.1.1
	ISC:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2019.01.09.16.55.21;	author christos;	state dead;
branches;
next	1.1;
commitid	grd0QDgIEpef587B;

1.1
date	2018.08.12.12.08.33;	author christos;	state Exp;
branches
	1.1.1.1;
next	;
commitid	vA9SFKj6FegqiPNA;

1.1.1.1
date	2018.08.12.12.08.33;	author christos;	state Exp;
branches
	1.1.1.1.2.1;
next	;
commitid	vA9SFKj6FegqiPNA;

1.1.1.1.2.1
date	2018.08.12.12.08.33;	author pgoyette;	state dead;
branches;
next	1.1.1.1.2.2;
commitid	HCi1bXD317XIK0RA;

1.1.1.1.2.2
date	2018.09.06.06.55.15;	author pgoyette;	state Exp;
branches;
next	1.1.1.1.2.3;
commitid	HCi1bXD317XIK0RA;

1.1.1.1.2.3
date	2019.01.18.08.50.06;	author pgoyette;	state dead;
branches;
next	;
commitid	Lmlzg3OVT2cd6f8B;


desc
@@


1.2
log
@merge conflicts, bump major, fix build.
@
text
@# 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.

check_PROGRAMS = bootstrap/h_app_empty
bootstrap_h_app_empty_SOURCES = bootstrap/h_app_empty.cpp
bootstrap_h_app_empty_LDADD = tools/libtools.a $(ATF_CXX_LIBS)

check_PROGRAMS += bootstrap/h_app_opts_args
bootstrap_h_app_opts_args_SOURCES = bootstrap/h_app_opts_args.cpp
bootstrap_h_app_opts_args_LDADD = tools/libtools.a $(ATF_CXX_LIBS)

check_PROGRAMS += bootstrap/h_tp_basic_c
bootstrap_h_tp_basic_c_SOURCES = bootstrap/h_tp_basic_c.c
bootstrap_h_tp_basic_c_LDADD = libatf-c.la

check_PROGRAMS += bootstrap/h_tp_basic_cpp
bootstrap_h_tp_basic_cpp_SOURCES = bootstrap/h_tp_basic_cpp.cpp
bootstrap_h_tp_basic_cpp_LDADD = $(ATF_CXX_LIBS)

check_SCRIPTS = bootstrap/h_tp_basic_sh
CLEANFILES += bootstrap/h_tp_basic_sh
EXTRA_DIST += bootstrap/h_tp_basic_sh.sh
bootstrap/h_tp_basic_sh: $(srcdir)/bootstrap/h_tp_basic_sh.sh
	$(AM_V_GEN)src=$(srcdir)/bootstrap/h_tp_basic_sh.sh; dst=$@@; $(BUILD_SH_TP)

check_SCRIPTS += bootstrap/h_tp_atf_check_sh
CLEANFILES += bootstrap/h_tp_atf_check_sh
EXTRA_DIST += bootstrap/h_tp_atf_check_sh.sh
bootstrap/h_tp_atf_check_sh: \
		$(srcdir)/bootstrap/h_tp_atf_check_sh.sh
	$(AM_V_GEN)src=$(srcdir)/bootstrap/h_tp_atf_check_sh.sh; dst=$@@; $(BUILD_SH_TP)

check_SCRIPTS += bootstrap/h_tp_fail
CLEANFILES += bootstrap/h_tp_fail
EXTRA_DIST += bootstrap/h_tp_fail.sh
bootstrap/h_tp_fail: $(srcdir)/bootstrap/h_tp_fail.sh
	$(AM_V_GEN)src=$(srcdir)/bootstrap/h_tp_fail.sh; dst=$@@; $(BUILD_SH_TP)

check_SCRIPTS += bootstrap/h_tp_pass
CLEANFILES += bootstrap/h_tp_pass
EXTRA_DIST += bootstrap/h_tp_pass.sh
bootstrap/h_tp_pass: $(srcdir)/bootstrap/h_tp_pass.sh
	$(AM_V_GEN)src=$(srcdir)/bootstrap/h_tp_pass.sh; dst=$@@; $(BUILD_SH_TP)

DISTCLEANFILES = \
		bootstrap/atconfig \
		testsuite.lineno \
		testsuite.log

distclean-local:
	-rm -rf testsuite.dir

EXTRA_DIST +=	bootstrap/testsuite \
		bootstrap/package.m4 \
		bootstrap/testsuite.at \
		$(testsuite_incs)

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 \
		$(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

@@target_srcdir@@bootstrap/package.m4: $(top_srcdir)/configure.ac
	{ \
	echo '# Signature of the current package.'; \
	echo 'm4_define(AT_PACKAGE_NAME,      @@PACKAGE_NAME@@)'; \
	echo 'm4_define(AT_PACKAGE_TARNAME,   @@PACKAGE_TARNAME@@)'; \
	echo 'm4_define(AT_PACKAGE_VERSION,   @@PACKAGE_VERSION@@)'; \
	echo 'm4_define(AT_PACKAGE_STRING,    @@PACKAGE_STRING@@)'; \
	echo 'm4_define(AT_PACKAGE_BUGREPORT, @@PACKAGE_BUGREPORT@@)'; \
	echo 'm4_define(ENABLE_TOOLS,         @@ENABLE_TOOLS@@)'; \
	} >$(srcdir)/bootstrap/package.m4

@@target_srcdir@@bootstrap/testsuite: $(srcdir)/bootstrap/testsuite.at \
                                    $(testsuite_incs) \
                                    @@target_srcdir@@bootstrap/package.m4
	autom4te --language=Autotest -I $(srcdir) \
	    -I $(srcdir)/bootstrap \
	    $(srcdir)/bootstrap/testsuite.at -o $@@.tmp
	mv $@@.tmp $@@

INSTALLCHECK_TARGETS += installcheck-bootstrap
PHONY_TARGETS += installcheck-bootstrap
installcheck-bootstrap: @@target_srcdir@@bootstrap/testsuite check
	$(TESTS_ENVIRONMENT) $(srcdir)/bootstrap/testsuite

# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import bind-9.12.2-P2 since bind-9.10 (the last BSD version) is
now out of support.  The changes since our last version imported
(9.10.7) version are too big to include inline here; please consult
the CHANGES file in this directory.
@
text
@@


1.1.1.1.2.1
log
@file Makefile.am.inc was added on branch pgoyette-compat on 2018-09-06 06:55:15 +0000
@
text
@d1 114
@


1.1.1.1.2.2
log
@Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)
@
text
@a0 114
# 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.

check_PROGRAMS = bootstrap/h_app_empty
bootstrap_h_app_empty_SOURCES = bootstrap/h_app_empty.cpp
bootstrap_h_app_empty_LDADD = tools/libtools.a $(ATF_CXX_LIBS)

check_PROGRAMS += bootstrap/h_app_opts_args
bootstrap_h_app_opts_args_SOURCES = bootstrap/h_app_opts_args.cpp
bootstrap_h_app_opts_args_LDADD = tools/libtools.a $(ATF_CXX_LIBS)

check_PROGRAMS += bootstrap/h_tp_basic_c
bootstrap_h_tp_basic_c_SOURCES = bootstrap/h_tp_basic_c.c
bootstrap_h_tp_basic_c_LDADD = libatf-c.la

check_PROGRAMS += bootstrap/h_tp_basic_cpp
bootstrap_h_tp_basic_cpp_SOURCES = bootstrap/h_tp_basic_cpp.cpp
bootstrap_h_tp_basic_cpp_LDADD = $(ATF_CXX_LIBS)

check_SCRIPTS = bootstrap/h_tp_basic_sh
CLEANFILES += bootstrap/h_tp_basic_sh
EXTRA_DIST += bootstrap/h_tp_basic_sh.sh
bootstrap/h_tp_basic_sh: $(srcdir)/bootstrap/h_tp_basic_sh.sh
	$(AM_V_GEN)src=$(srcdir)/bootstrap/h_tp_basic_sh.sh; dst=$@@; $(BUILD_SH_TP)

check_SCRIPTS += bootstrap/h_tp_atf_check_sh
CLEANFILES += bootstrap/h_tp_atf_check_sh
EXTRA_DIST += bootstrap/h_tp_atf_check_sh.sh
bootstrap/h_tp_atf_check_sh: \
		$(srcdir)/bootstrap/h_tp_atf_check_sh.sh
	$(AM_V_GEN)src=$(srcdir)/bootstrap/h_tp_atf_check_sh.sh; dst=$@@; $(BUILD_SH_TP)

check_SCRIPTS += bootstrap/h_tp_fail
CLEANFILES += bootstrap/h_tp_fail
EXTRA_DIST += bootstrap/h_tp_fail.sh
bootstrap/h_tp_fail: $(srcdir)/bootstrap/h_tp_fail.sh
	$(AM_V_GEN)src=$(srcdir)/bootstrap/h_tp_fail.sh; dst=$@@; $(BUILD_SH_TP)

check_SCRIPTS += bootstrap/h_tp_pass
CLEANFILES += bootstrap/h_tp_pass
EXTRA_DIST += bootstrap/h_tp_pass.sh
bootstrap/h_tp_pass: $(srcdir)/bootstrap/h_tp_pass.sh
	$(AM_V_GEN)src=$(srcdir)/bootstrap/h_tp_pass.sh; dst=$@@; $(BUILD_SH_TP)

DISTCLEANFILES = \
		bootstrap/atconfig \
		testsuite.lineno \
		testsuite.log

distclean-local:
	-rm -rf testsuite.dir

EXTRA_DIST +=	bootstrap/testsuite \
		bootstrap/package.m4 \
		bootstrap/testsuite.at \
		$(testsuite_incs)

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 \
		$(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

@@target_srcdir@@bootstrap/package.m4: $(top_srcdir)/configure.ac
	{ \
	echo '# Signature of the current package.'; \
	echo 'm4_define(AT_PACKAGE_NAME,      @@PACKAGE_NAME@@)'; \
	echo 'm4_define(AT_PACKAGE_TARNAME,   @@PACKAGE_TARNAME@@)'; \
	echo 'm4_define(AT_PACKAGE_VERSION,   @@PACKAGE_VERSION@@)'; \
	echo 'm4_define(AT_PACKAGE_STRING,    @@PACKAGE_STRING@@)'; \
	echo 'm4_define(AT_PACKAGE_BUGREPORT, @@PACKAGE_BUGREPORT@@)'; \
	echo 'm4_define(ENABLE_TOOLS,         @@ENABLE_TOOLS@@)'; \
	} >$(srcdir)/bootstrap/package.m4

@@target_srcdir@@bootstrap/testsuite: $(srcdir)/bootstrap/testsuite.at \
                                    $(testsuite_incs) \
                                    @@target_srcdir@@bootstrap/package.m4
	autom4te --language=Autotest -I $(srcdir) \
	    -I $(srcdir)/bootstrap \
	    $(srcdir)/bootstrap/testsuite.at -o $@@.tmp
	mv $@@.tmp $@@

INSTALLCHECK_TARGETS += installcheck-bootstrap
PHONY_TARGETS += installcheck-bootstrap
installcheck-bootstrap: @@target_srcdir@@bootstrap/testsuite check
	$(TESTS_ENVIRONMENT) $(srcdir)/bootstrap/testsuite

# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
@


1.1.1.1.2.3
log
@Synch with HEAD
@
text
@@