summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorjmmv <jmmv@NetBSD.org>2009-01-19 07:08:14 +0000
committerjmmv <jmmv@NetBSD.org>2009-01-19 07:08:14 +0000
commit0cdcf7cea65e81fba8c1f316cd1141a6ff669c18 (patch)
tree4d743667d72eda87b8e68aa2c44fca4032e4d2c2 /share
parent2e51a772b32893921b99424a86f0bd8cb86484cd (diff)
Remove ATF 0.5 from dist/atf and all of the reachover Makefiles used to
build it. 0.6 is going to be imported in external/bsd/atf, with all the necessary Makefiles in that same hierarchy.
Diffstat (limited to 'share')
-rw-r--r--share/Makefile4
-rw-r--r--share/atf/Makefile18
-rw-r--r--share/doc/atf/Makefile27
-rw-r--r--share/examples/Makefile4
-rw-r--r--share/examples/atf/Makefile13
-rw-r--r--share/xml/atf/Makefile12
-rw-r--r--share/xsl/atf/Makefile12
7 files changed, 4 insertions, 86 deletions
diff --git a/share/Makefile b/share/Makefile
index 1105272f05e..5f48c7e33da 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/10/12 23:00:54 mrg Exp $
+# $NetBSD: Makefile,v 1.30 2009/01/19 07:08:14 jmmv Exp $
# from @(#)Makefile 8.1 (Berkeley) 6/5/93
# Missing: ms
@@ -7,7 +7,7 @@
.if ${MKSHARE} != "no" || \
make(clean) || make(cleandir) || make(distclean) || make(obj)
-SUBDIR= atf dict doc examples legal man me misc mk \
+SUBDIR= dict doc examples legal man me misc mk \
tabset termcap tmac wscons xml xsl zoneinfo
.if ${MKNLS} != "no"
SUBDIR+=i18n locale nls
diff --git a/share/atf/Makefile b/share/atf/Makefile
deleted file mode 100644
index 79f0b62add0..00000000000
--- a/share/atf/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2008/10/30 21:37:55 mrg Exp $
-
-.include <bsd.own.mk>
-
-.if ${MKSHARE} != "no"
-
-SRCDIR= ${NETBSDSRCDIR}/dist/atf
-.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>
diff --git a/share/doc/atf/Makefile b/share/doc/atf/Makefile
deleted file mode 100644
index a123eac1e7e..00000000000
--- a/share/doc/atf/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:35 apb Exp $
-
-.include <bsd.own.mk>
-
-SRCDIR= ${NETBSDSRCDIR}/dist/atf
-.PATH: ${SRCDIR}
-.PATH: ${SRCDIR}/atf-c
-.PATH: ${SRCDIR}/atf-c++
-.PATH: ${SRCDIR}/atf-sh
-.PATH: ${SRCDIR}/doc
-
-.if ${MKDOC} != "no"
-FILESDIR= /usr/share/doc/atf
-FILES= AUTHORS COPYING NEWS README ROADMAP
-.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
- ${TOOL_SED} -e 's,__DOCDIR__,/usr/share/doc/atf,g' \
- <${SRCDIR}/doc/atf.7.in >atf.7.tmp
- mv atf.7.tmp atf.7
-
-.include <bsd.files.mk>
-.include <bsd.man.mk>
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 6ff5797e584..1f4244bf839 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2008/10/25 17:43:24 christos Exp $
+# $NetBSD: Makefile,v 1.17 2009/01/19 07:08:28 jmmv Exp $
-SUBDIR= amd apm atf disktab emul fstab ftpd hostapd isdn pppd racoon \
+SUBDIR= amd apm disktab emul fstab ftpd hostapd isdn pppd racoon \
supfiles syslogd wsmoused
.include <bsd.subdir.mk>
diff --git a/share/examples/atf/Makefile b/share/examples/atf/Makefile
deleted file mode 100644
index 2ef99800956..00000000000
--- a/share/examples/atf/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/11/12 20:13:21 jmmv Exp $
-
-.include <bsd.own.mk>
-
-SRCDIR= ${NETBSDSRCDIR}/dist/atf
-.PATH: ${SRCDIR}/data
-
-FILESDIR= /usr/share/examples/atf
-FILESMODE= 444
-FILES= atf-run.hooks \
- tests-results.css
-
-.include <bsd.prog.mk>
diff --git a/share/xml/atf/Makefile b/share/xml/atf/Makefile
deleted file mode 100644
index 893c76b1390..00000000000
--- a/share/xml/atf/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2007/11/12 15:01:51 jmmv Exp $
-
-.include <bsd.own.mk>
-
-SRCDIR= ${NETBSDSRCDIR}/dist/atf
-.PATH: ${SRCDIR}/data
-
-FILESDIR= /usr/share/xml/atf
-FILESMODE= 444
-FILES= tests-results.dtd
-
-.include <bsd.prog.mk>
diff --git a/share/xsl/atf/Makefile b/share/xsl/atf/Makefile
deleted file mode 100644
index b36ce229dee..00000000000
--- a/share/xsl/atf/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2007/11/12 15:01:51 jmmv Exp $
-
-.include <bsd.own.mk>
-
-SRCDIR= ${NETBSDSRCDIR}/dist/atf
-.PATH: ${SRCDIR}/data
-
-FILESDIR= /usr/share/xsl/atf
-FILESMODE= 444
-FILES= tests-results.xsl
-
-.include <bsd.prog.mk>