summaryrefslogtreecommitdiff
path: root/regress/lib
diff options
context:
space:
mode:
Diffstat (limited to 'regress/lib')
-rw-r--r--regress/lib/libc_r/Makefile.inc15
-rw-r--r--regress/lib/libpthread/Makefile.inc15
2 files changed, 6 insertions, 24 deletions
diff --git a/regress/lib/libc_r/Makefile.inc b/regress/lib/libc_r/Makefile.inc
index d5cb0b8f4a0..306a37d132c 100644
--- a/regress/lib/libc_r/Makefile.inc
+++ b/regress/lib/libc_r/Makefile.inc
@@ -1,19 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.7 2002/11/16 05:02:48 marc Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2003/01/14 20:04:44 marc Exp $
# Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu
-LIBC_R?= /usr/lib/libc_r.a
-LIBPTHREAD?= /usr/lib/libnpthread.a
-USELIBPTHREAD?= no
+LIBPTHREAD= /usr/lib/libpthread.a
-.if ${USELIBPTHREAD:L} == yes
-# this tests using libnpthread/libc
-LDADD+= -lnpthread
-DPADD+= ${LIBPTHREAD}
-.else
-# This tests using libc_r
LDADD+= -pthread
-DPADD+= ${LIBC_R}
-.endif
+DPADD+= ${LIBPTHREAD}
CFLAGS+= -Wall # -Werror
#DEBUG= -ggdb
diff --git a/regress/lib/libpthread/Makefile.inc b/regress/lib/libpthread/Makefile.inc
index d5cb0b8f4a0..306a37d132c 100644
--- a/regress/lib/libpthread/Makefile.inc
+++ b/regress/lib/libpthread/Makefile.inc
@@ -1,19 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.7 2002/11/16 05:02:48 marc Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2003/01/14 20:04:44 marc Exp $
# Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu
-LIBC_R?= /usr/lib/libc_r.a
-LIBPTHREAD?= /usr/lib/libnpthread.a
-USELIBPTHREAD?= no
+LIBPTHREAD= /usr/lib/libpthread.a
-.if ${USELIBPTHREAD:L} == yes
-# this tests using libnpthread/libc
-LDADD+= -lnpthread
-DPADD+= ${LIBPTHREAD}
-.else
-# This tests using libc_r
LDADD+= -pthread
-DPADD+= ${LIBC_R}
-.endif
+DPADD+= ${LIBPTHREAD}
CFLAGS+= -Wall # -Werror
#DEBUG= -ggdb