8 files changed, 24 insertions, 64 deletions
diff --git a/regress/lib/libc/_setjmp/Makefile b/regress/lib/libc/_setjmp/Makefile
index cacc8028402..5d582425232 100644
--- a/regress/lib/libc/_setjmp/Makefile
+++ b/regress/lib/libc/_setjmp/Makefile
@@ -1,17 +1,11 @@
-#	$OpenBSD: Makefile,v 1.2 2001/01/29 02:05:38 niklas Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/01/01 23:00:51 art Exp $
 #	$NetBSD: Makefile,v 1.2 1995/04/20 22:38:44 cgd Exp $
 
 PROG=	_setjmptest
 SRCS=	jmptest.c
-NOMAN=	noman, no way, man
 
 CFLAGS+= -DTEST_U_SETJMP
 
 .PATH:	${.CURDIR}/../setjmp
 
-install:
-
-regress: ${PROG}
-	./${PROG}
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/lib/libc/ieeefp/except/Makefile b/regress/lib/libc/ieeefp/except/Makefile
index ad9698f74fc..e4b47eec263 100644
--- a/regress/lib/libc/ieeefp/except/Makefile
+++ b/regress/lib/libc/ieeefp/except/Makefile
@@ -1,13 +1,7 @@
-#	$OpenBSD: Makefile,v 1.2 2001/01/29 02:05:42 niklas Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/01/01 23:00:51 art Exp $
 #	$NetBSD: Makefile,v 1.1 1995/04/26 00:27:25 jtc Exp $
 
 PROG=	except
 SRCS=	except.c
-NOMAN=
 
-install:
-
-regress: ${PROG}
-	./${PROG}
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/lib/libc/ieeefp/round/Makefile b/regress/lib/libc/ieeefp/round/Makefile
index c8e5c4f4d66..a54671f51e8 100644
--- a/regress/lib/libc/ieeefp/round/Makefile
+++ b/regress/lib/libc/ieeefp/round/Makefile
@@ -1,13 +1,7 @@
-#	$OpenBSD: Makefile,v 1.2 2001/01/29 02:05:42 niklas Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/01/01 23:00:51 art Exp $
 #	$NetBSD: Makefile,v 1.1 1995/04/26 00:27:27 jtc Exp $
 
 PROG=	round
 SRCS=	round.c
-NOMAN=
 
-install:
-
-regress: ${PROG}
-	./${PROG}
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/lib/libc/malloc/Makefile b/regress/lib/libc/malloc/Makefile
index ca8fb323439..e328451d5a2 100644
--- a/regress/lib/libc/malloc/Makefile
+++ b/regress/lib/libc/malloc/Makefile
@@ -1,14 +1,6 @@
-#	$OpenBSD: Makefile,v 1.1 2001/12/05 09:52:01 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/01/01 23:00:51 art Exp $
 #	$NetBSD: Makefile,v 1.2 1995/04/20 22:40:13 cgd Exp $
 
 PROG=	malloc0test
-NOMAN=	noman, no way, man
 
-.PATH:	${.CURDIR}/../malloc
-
-install:
-
-regress: ${PROG}
-	./${PROG}
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/lib/libc/regex/Makefile b/regress/lib/libc/regex/Makefile
index 4a223b34c43..76d68a56ae6 100644
--- a/regress/lib/libc/regex/Makefile
+++ b/regress/lib/libc/regex/Makefile
@@ -1,17 +1,20 @@
-#	$OpenBSD: Makefile,v 1.3 2001/02/04 14:44:00 ericj Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/01/01 23:00:51 art Exp $
 #	$NetBSD: Makefile,v 1.2 1995/02/16 19:38:45 cgd Exp $
 
 PROG=	re
 SRCS=	main.c split.c debug.c
-NOMAN=
 
 CFLAGS+= -I${.CURDIR}/../../../../lib/libc/regex
 
 TESTS=	${.CURDIR}/tests
 
-regress: ${PROG}
+REGRESSTARGETS=do-reg do-reg-long do-reg-backref
+
+do-reg: ${PROG}
 	./re < ${TESTS}
+do-reg-long: ${PROG}
 	./re -el < ${TESTS}
+do-reg-backref: ${PROG}
 	./re -er < ${TESTS}
 
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/lib/libc/setjmp/Makefile b/regress/lib/libc/setjmp/Makefile
index ebb76e004b8..fc68e8d44cd 100644
--- a/regress/lib/libc/setjmp/Makefile
+++ b/regress/lib/libc/setjmp/Makefile
@@ -1,17 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 2001/01/29 02:05:45 niklas Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/01/01 23:00:51 art Exp $
 #	$NetBSD: Makefile,v 1.2 1995/04/20 22:40:13 cgd Exp $
 
 PROG=	setjmptest
 SRCS=	jmptest.c
-NOMAN=	noman, no way, man
 
 CFLAGS+= -DTEST_SETJMP
 
-.PATH:	${.CURDIR}/../setjmp
-
-install:
-
-regress: ${PROG}
-	./${PROG}
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/lib/libc/sigreturn/Makefile b/regress/lib/libc/sigreturn/Makefile
index 6a40c40fe0c..3212ec46354 100644
--- a/regress/lib/libc/sigreturn/Makefile
+++ b/regress/lib/libc/sigreturn/Makefile
@@ -1,16 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2001/12/17 02:36:00 marc Exp $
+# $OpenBSD: Makefile,v 1.2 2002/01/01 23:00:51 art Exp $
 
 PROG=	sigret
-SRCS=	sigret.c
-NOMAN=	noman
 
 DEBUG+= -ggdb
 
-.PATH:	${.CURDIR}/../sigret
-
-install:
-
-regress: ${PROG}
-	./${PROG}
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/lib/libc/sigsetjmp/Makefile b/regress/lib/libc/sigsetjmp/Makefile
index 2cab37a15e6..90964b312f6 100644
--- a/regress/lib/libc/sigsetjmp/Makefile
+++ b/regress/lib/libc/sigsetjmp/Makefile
@@ -1,18 +1,18 @@
-#	$OpenBSD: Makefile,v 1.2 2001/01/29 02:05:46 niklas Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/01/01 23:00:52 art Exp $
 #	$NetBSD: Makefile,v 1.2 1995/04/20 22:40:40 cgd Exp $
 
 PROG=	sigsetjmptest
 SRCS=	jmptest.c
-NOMAN=	noman, no way, man
 
 CFLAGS+= -DTEST_SIGSETJMP
 
 .PATH:	${.CURDIR}/../setjmp
 
-install:
+REGRESSTARGETS=sigsetjmp-save sigsetjmp-nosave
 
-regress: ${PROG}
+sigsetjmp-save: ${PROG}
 	./${PROG} save
+sigsetjmp-nosave: ${PROG}
 	./${PROG} nosave
 
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>