diff options
| author |   guenther <guenther@openbsd.org> | 2012-06-28 06:18:46 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2012-06-28 06:18:46 +0000 |
| commit | da179bac86e2a84196cf846d35e4388bb769c06b (patch) | |
| tree | 6dc5a47ed74c9170bf1b3e44a1a3630666f67a46 | |
| parent | Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed (diff) | |
| download | wireguard-openbsd-da179bac86e2a84196cf846d35e4388bb769c06b.tar.xz wireguard-openbsd-da179bac86e2a84196cf846d35e4388bb769c06b.zip | |
librthread has eaten libpthread, so build includes via the former instead
of the latter. Permits the misleading lib/libpthread/Makefile to be
removed
discussed with deraadt@
| -rw-r--r-- | include/Makefile | 4 | ||||
| -rw-r--r-- | lib/libpthread/Makefile | 16 |
2 files changed, 2 insertions, 18 deletions
diff --git a/include/Makefile b/include/Makefile index 5f5a355d66c..6b29c51de88 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.164 2012/06/26 16:16:16 deraadt Exp $ +# $OpenBSD: Makefile,v 1.165 2012/06/28 06:18:46 guenther Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -41,7 +41,7 @@ LDIRS= altq crypto ddb dev isofs miscfs msdosfs net netinet netinet6 \ PRDIRS= # Directories with an includes target -RDIRS= ../lib/libpthread ../lib/libcompat ../lib/libcurses \ +RDIRS= ../lib/librthread ../lib/libcompat ../lib/libcurses \ ../lib/libform ../lib/libssl ../lib/libmenu \ ../lib/libocurses ../lib/libossaudio ../lib/libpanel ../lib/librpcsvc \ ../lib/libskey ../lib/libedit ../lib/libexpat \ diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile deleted file mode 100644 index e96ae83e0f0..00000000000 --- a/lib/libpthread/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $OpenBSD: Makefile,v 1.25 2012/06/21 02:46:38 deraadt Exp $ - -# -# librthread still uses this -# - -SRCDIR= ${.CURDIR} -LIBCSRCDIR= ${.CURDIR}/../libc - -.include "${SRCDIR}/include/Makefile.inc" -.include "${SRCDIR}/sys/Makefile.inc" -.include "${SRCDIR}/thread/Makefile.inc" -.include "${SRCDIR}/uthread/Makefile.inc" -.include "${SRCDIR}/man/Makefile.inc" - -.include <bsd.lib.mk> |