Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust reachover makefiles for atf 0.9.

Browse Source
This commit is contained in:
jmmv 2010-06-04 08:33:40 +00:00
parent 72b75bb2dc
commit bd35535074
22 changed files with 97 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/bsd/atf/etc/atf/Makefile vendored
View File

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:03 jmmv Exp $
# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:40 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/data
.PATH: ${SRCDIR}/atf-run/sample
CONFIGFILES= NetBSD.conf atf-run.hooks
FILESDIR= /etc/atf

18
external/bsd/atf/lib/libatf-c++/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
NOLINT= # defined
@ -64,6 +64,20 @@ INCSDIR= /usr/include/atf-c++
INCS+= atf-c++.hpp
INCSDIR_atf-c++.hpp=/usr/include
MAN= # empty
MAN= atf-c++-api.3
.if ${MKSHARE} != "no"
FILES+= atf-c++.pc
FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
${TOOL_SED} -e 's,__ATF_VERSION__,0.9,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
<${SRCDIR}/atf-c++/atf-c++.pc.in >atf-c++.pc
CLEANFILES+= atf-c++.pc
.endif
.include <bsd.lib.mk>

20
external/bsd/atf/lib/libatf-c/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:33 jmmv Exp $
# $NetBSD: Makefile,v 1.5 2010/06/04 08:33:41 jmmv Exp $
NOLINT= # defined
@ -44,7 +44,6 @@ SRCS= build.c \
io.c \
list.c \
map.c \
object.c \
process.c \
sanity.c \
text.c \
@ -68,7 +67,6 @@ INCS= build.h \
list.h \
macros.h \
map.h \
object.h \
process.h \
sanity.h \
tc.h \
@ -82,7 +80,7 @@ INCSDIR= /usr/include/atf-c
INCS+= atf-c.h
INCSDIR_atf-c.h=/usr/include
MAN= # empty
MAN= atf-c-api.3
CLEANFILES+= defs.h
@ -92,4 +90,18 @@ defs.h: defs.h.in
< ${.ALLSRC} > ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
.if ${MKSHARE} != "no"
FILES+= atf-c.pc
FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
${TOOL_SED} -e 's,__ATF_VERSION__,0.9,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
<${SRCDIR}/atf-c/atf-c.pc.in >atf-c.pc
CLEANFILES+= atf-c.pc
.endif
.include <bsd.lib.mk>

15
external/bsd/atf/lib/libatf-c/bconfig.h vendored
View File

@ -1,6 +1,15 @@
/* bconfig.h. Generated from bconfig.h.in by configure. */
/* bconfig.h.in. Generated from configure.ac by autoheader. */
/* Define to the path of chattr(1) if you have it */
/* #undef CHATTR */
/* Define to 1 if you have chattr(1) */
/* #undef HAVE_CHATTR */
/* Define to 1 if you have the `chflags' function. */
#define HAVE_CHFLAGS 1
/* Define to 1 if basename takes a constant pointer */
/* #undef HAVE_CONST_BASENAME */
@ -93,7 +102,7 @@
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "Automated Testing Framework 0.8"
#define PACKAGE_STRING "Automated Testing Framework 0.9"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
@ -102,10 +111,10 @@
#define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.8"
#define PACKAGE_VERSION "0.9"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
#define VERSION "0.8"
#define VERSION "0.9"

4
external/bsd/atf/share/Makefile vendored
View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:41 jmmv Exp $
SUBDIR= atf doc examples xml xsl
SUBDIR= doc examples xml xsl
.include <bsd.subdir.mk>

19
external/bsd/atf/share/atf/Makefile vendored
View File

@ -1,19 +0,0 @@
# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/data ${SRCDIR}/atf-sh
# Files in ${SRCDIR}/subrs.
FILESDIR= /usr/share/atf
FILESMODE= 444
FILES= atf.footer.subr \
atf.header.subr \
atf.init.subr
.endif
.include <bsd.prog.mk>

3
external/bsd/atf/share/doc/atf/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
@ -15,7 +15,6 @@ FILES= AUTHORS COPYING NEWS README
.endif
MAN= atf.7 atf-formats.5 atf-test-case.4 atf-test-program.1
MAN+= atf-c-api.3 atf-c++-api.3 atf-sh-api.3
CLEANFILES+= atf.7 atf.7.tmp
atf.7: atf.7.in

5
external/bsd/atf/share/examples/atf/Makefile vendored
View File

@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.2 2009/12/13 21:14:18 snj Exp $
# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/data
.PATH: ${SRCDIR}/atf-report
.PATH: ${SRCDIR}/atf-run/sample
FILESDIR= /usr/share/examples/atf
FILESMODE= 444

4
external/bsd/atf/share/xml/atf/Makefile vendored
View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.2 2009/12/13 21:14:18 snj Exp $
# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/data
.PATH: ${SRCDIR}/atf-report
FILESDIR= /usr/share/xml/atf
FILESMODE= 444

4
external/bsd/atf/share/xsl/atf/Makefile vendored
View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.2 2009/12/13 21:14:18 snj Exp $
# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/data
.PATH: ${SRCDIR}/atf-report
FILESDIR= /usr/share/xsl/atf
FILESMODE= 444

4
external/bsd/atf/tests/atf/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:34 jmmv Exp $
# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
@ -8,12 +8,10 @@ SUBDIR= atf-c \
atf-c++ \
atf-check \
atf-cleanup \
atf-compile \
atf-config \
atf-report \
atf-run \
atf-sh \
data \
formats \
test_programs

4
external/bsd/atf/tests/atf/atf-c++/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
@ -63,4 +63,6 @@ SRCS.${test}= ${test}.cpp h_lib.cpp
.endfor
.undef test
TESTS_SH= t_pkg_config
.include <bsd.test.mk>

5
external/bsd/atf/tests/atf/atf-c/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2010/05/08 08:12:34 jmmv Exp $
# $NetBSD: Makefile,v 1.4 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
@ -29,7 +29,6 @@ FILES= d_include_atf_c_h.c \
d_include_list_h.c \
d_include_macros_h.c \
d_include_map_h.c \
d_include_object_h.c \
d_include_process_h.c \
d_include_sanity_h.c \
d_include_tc_h.c \
@ -67,4 +66,6 @@ SRCS.${test}= ${test}.c h_lib.c
.endfor
.undef test
TESTS_SH= t_pkg_config
.include <bsd.test.mk>

16
external/bsd/atf/tests/atf/atf-compile/Makefile vendored
View File

@ -1,16 +0,0 @@
# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-compile
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tests/atf/atf-compile
TESTS_SH= t_integration
BINDIR= ${TESTSDIR}
PROGS_CXX= h_mode
MAN.h_mode= # empty
.include <bsd.test.mk>

4
external/bsd/atf/tests/atf/atf-run/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:42 jmmv Exp $
.include <bsd.own.mk>
@ -8,7 +8,7 @@ SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-run
.PATH: ${SRCDIR}/tests/atf/atf-run
CPPFLAGS+= -I${SRCDIR}
CPPFLAGS+= -I${SRCDIR}/atf-run
TESTS_CXX= h_bad_metadata
TESTS_CXX+= h_fail

3
external/bsd/atf/tests/atf/atf-sh/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:05 jmmv Exp $
# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:42 jmmv Exp $
.include <bsd.own.mk>
@ -10,6 +10,7 @@ SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
TESTS_SH= h_misc
TESTS_SH+= t_atf_check
TESTS_SH+= t_config
TESTS_SH+= t_integration
TESTS_SH+= t_normalize
TESTS_SH+= t_tc
TESTS_SH+= t_tp

12
external/bsd/atf/tests/atf/data/Makefile vendored
View File

@ -1,12 +0,0 @@
# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:05 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf/data
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tests/atf/data
TESTS_SH= t_pkg_config
.include <bsd.test.mk>

4
external/bsd/atf/usr.bin/Makefile vendored
View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:06 jmmv Exp $
# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:42 jmmv Exp $
SUBDIR= atf-check atf-compile atf-config atf-report atf-run atf-version
SUBDIR= atf-check atf-config atf-report atf-run atf-sh atf-version
.include <bsd.subdir.mk>

17
external/bsd/atf/usr.bin/atf-compile/Makefile vendored
View File

@ -1,17 +0,0 @@
# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:35 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-compile
BINDIR= /usr/bin
PROG_CXX= atf-compile
SRCS= atf-compile.cpp
MAN= atf-compile.1
LDADD+= -latf-c++ -latf-c
WARNS?= 2
.include <bsd.prog.mk>

29
external/bsd/atf/usr.bin/atf-run/Makefile vendored
View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.5 2010/05/08 16:57:24 jmmv Exp $
# $NetBSD: Makefile,v 1.6 2010/06/04 08:33:42 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-run
.PATH: ${SRCDIR}/data ${SRCDIR}/atf-sh
.PATH: ${SRCDIR}/atf-run/share
BINDIR= /usr/bin
PROG_CXX= atf-run
@ -22,31 +22,8 @@ WARNS?= 2
.if ${MKSHARE} != "no"
FILESDIR= /usr/share/atf
FILESMODE= 444
FILES= atf-run.hooks
.endif
# Files in ${SRCDIR}/data.
FILES+= atf-c.pc \
atf-c++.pc
FILESDIR_atf-c.pc= /usr/lib/pkgconfig
FILESDIR_atf-c++.pc= /usr/lib/pkgconfig
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
${TOOL_SED} -e 's,__ATF_VERSION__,0.8,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
<${SRCDIR}/data/atf-c.pc.in >atf-c.pc
CLEANFILES+= atf-c.pc
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
${TOOL_SED} -e 's,__ATF_VERSION__,0.8,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
<${SRCDIR}/data/atf-c++.pc.in >atf-c++.pc
CLEANFILES+= atf-c++.pc
.include <bsd.prog.mk>

23
external/bsd/atf/usr.bin/atf-sh/Makefile vendored Normal file
View File

@ -0,0 +1,23 @@
# $NetBSD: Makefile,v 1.1 2010/06/04 08:33:42 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-sh
BINDIR= /usr/bin
PROG_CXX= atf-sh
SRCS= atf-sh.cpp
MAN= atf-sh.1 atf-sh-api.3
LDADD+= -latf-c++ -latf-c
WARNS?= 2
.if ${MKSHARE} != "no"
FILESDIR= /usr/share/atf
FILESMODE= 444
FILES+= libatf-sh.subr
.endif
.include <bsd.prog.mk>

4
external/bsd/atf/usr.bin/atf-version/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2010/05/14 15:30:39 christos Exp $
# $NetBSD: Makefile,v 1.4 2010/06/04 08:33:42 jmmv Exp $
.include <bsd.own.mk>
@ -12,7 +12,7 @@ MAN= atf-version.1
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
CPPFLAGS+= -I.. -I.
CPPFLAGS+= -I.
LDADD+= -latf-c++ -latf-c
WARNS?= 2