diff options
| -rw-r--r-- | include/Makefile | 36 | ||||
| -rw-r--r-- | include/pthread.h (renamed from lib/libpthread/include/pthread.h) | 2 | ||||
| -rw-r--r-- | include/pthread_np.h (renamed from lib/libpthread/include/pthread_np.h) | 2 | ||||
| -rw-r--r-- | include/sched.h (renamed from lib/libpthread/include/sched.h) | 2 | ||||
| -rw-r--r-- | include/semaphore.h (renamed from lib/libpthread/include/semaphore.h) | 2 | ||||
| -rw-r--r-- | lib/libpthread/include/Makefile.inc | 11 | ||||
| -rw-r--r-- | lib/librthread/Makefile | 3 |
7 files changed, 28 insertions, 30 deletions
diff --git a/include/Makefile b/include/Makefile index 24ada3330ea..cddfefdcfec 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.220 2017/10/06 19:58:37 naddy Exp $ +# $OpenBSD: Makefile,v 1.221 2017/10/15 23:40:33 guenther Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -9,17 +9,27 @@ .include <bsd.own.mk> -FILES= a.out.h ar.h asr.h assert.h bitstring.h blf.h bsd_auth.h \ - complex.h cpio.h ctype.h curses.h db.h dirent.h disktab.h \ - dlfcn.h elf_abi.h err.h errno.h fenv.h float.h fnmatch.h fstab.h fts.h \ - ftw.h getopt.h glob.h grp.h icdb.h ieeefp.h ifaddrs.h inttypes.h \ - iso646.h kvm.h langinfo.h libgen.h limits.h link.h link_elf.h \ - locale.h login_cap.h math.h md5.h memory.h ndbm.h netdb.h netgroup.h \ - nlist.h nl_types.h paths.h poll.h pwd.h ranlib.h readpassphrase.h \ - regex.h resolv.h rmd160.h search.h setjmp.h sha1.h sha2.h signal.h \ - siphash.h sndio.h spawn.h stdbool.h stddef.h stdio.h stdlib.h \ - string.h strings.h sysexits.h tar.h tgmath.h tib.h time.h \ - ttyent.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h +FILES= a.out.h ar.h asr.h assert.h \ + bitstring.h blf.h bsd_auth.h \ + complex.h cpio.h ctype.h curses.h \ + db.h dirent.h disktab.h dlfcn.h \ + elf_abi.h err.h errno.h \ + fenv.h float.h fnmatch.h fstab.h fts.h ftw.h \ + getopt.h glob.h grp.h \ + icdb.h ieeefp.h ifaddrs.h inttypes.h iso646.h \ + kvm.h \ + langinfo.h libgen.h limits.h link.h link_elf.h locale.h login_cap.h \ + math.h md5.h memory.h \ + ndbm.h netdb.h netgroup.h nlist.h nl_types.h \ + paths.h poll.h pthread.h pthread_np.h pwd.h \ + ranlib.h readpassphrase.h regex.h resolv.h rmd160.h \ + sched.h search.h setjmp.h semaphore.h sha1.h sha2.h \ + signal.h siphash.h sndio.h spawn.h stdbool.h stddef.h \ + stdio.h stdlib.h string.h strings.h sysexits.h \ + tar.h tgmath.h tib.h time.h ttyent.h \ + unistd.h utime.h utmp.h uuid.h \ + vis.h \ + wchar.h wctype.h MFILES= frame.h LFILES= endian.h fcntl.h syslog.h termios.h stdarg.h stdint.h varargs.h @@ -36,7 +46,7 @@ RDIRS= ../lib/libcurses ../lib/libedit \ ../lib/libevent ../lib/libexpat ../lib/libform \ ../lib/libfuse ../lib/libkeynote ../lib/libmenu \ ../lib/libossaudio ../lib/libpanel ../lib/libpcap \ - ../lib/libradius ../lib/librthread \ + ../lib/libradius \ ../lib/libskey ../lib/libssl ../lib/libtls \ ../lib/libusbhid ../lib/libutil ../lib/libz \ ../usr.bin/lex ../gnu/lib/libreadline \ diff --git a/lib/libpthread/include/pthread.h b/include/pthread.h index ba6bda588cf..f2a4dff1ca8 100644 --- a/lib/libpthread/include/pthread.h +++ b/include/pthread.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread.h,v 1.41 2015/03/19 21:18:59 kettenis Exp $ */ +/* $OpenBSD: pthread.h,v 1.1 2017/10/15 23:40:33 guenther Exp $ */ /* * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu diff --git a/lib/libpthread/include/pthread_np.h b/include/pthread_np.h index 310fe85a053..d606735e787 100644 --- a/lib/libpthread/include/pthread_np.h +++ b/include/pthread_np.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread_np.h,v 1.11 2012/03/22 17:21:36 kurt Exp $ */ +/* $OpenBSD: pthread_np.h,v 1.1 2017/10/15 23:40:33 guenther Exp $ */ /* * Copyright (c) 1996-98 John Birrell <jb@cimlogic.com.au>. * All rights reserved. diff --git a/lib/libpthread/include/sched.h b/include/sched.h index d8aef46f111..8e468b48963 100644 --- a/lib/libpthread/include/sched.h +++ b/include/sched.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sched.h,v 1.9 2012/12/05 23:20:05 deraadt Exp $ */ +/* $OpenBSD: sched.h,v 1.1 2017/10/15 23:40:33 guenther Exp $ */ /* sched.h: POSIX 1003.1b Process Scheduling header */ diff --git a/lib/libpthread/include/semaphore.h b/include/semaphore.h index dcdbbd8c4f0..21dc1a25bed 100644 --- a/lib/libpthread/include/semaphore.h +++ b/include/semaphore.h @@ -1,4 +1,4 @@ -/* $OpenBSD: semaphore.h,v 1.9 2013/03/26 14:38:08 deraadt Exp $ */ +/* $OpenBSD: semaphore.h,v 1.1 2017/10/15 23:40:33 guenther Exp $ */ /* semaphore.h: POSIX 1003.1b semaphores */ diff --git a/lib/libpthread/include/Makefile.inc b/lib/libpthread/include/Makefile.inc deleted file mode 100644 index d46b5e6386c..00000000000 --- a/lib/libpthread/include/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -# $OpenBSD: Makefile.inc,v 1.7 2014/07/16 20:02:17 okan Exp $ - -includes: - @cd ${SRCDIR}/include; \ - for h in pthread.h pthread_np.h sched.h semaphore.h; do \ - cmp -s $$h ${DESTDIR}/usr/include/$$h > /dev/null 2>&1 || \ - (echo ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \ - -m 444 $$h ${DESTDIR}/usr/include; \ - ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - $$h ${DESTDIR}/usr/include) || exit 1; \ - done diff --git a/lib/librthread/Makefile b/lib/librthread/Makefile index 78f706087fc..4c3e127491d 100644 --- a/lib/librthread/Makefile +++ b/lib/librthread/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.48 2017/09/05 02:40:54 guenther Exp $ +# $OpenBSD: Makefile,v 1.49 2017/10/15 23:40:33 guenther Exp $ LIB=pthread LIBCSRCDIR= ${.CURDIR}/../libc @@ -37,7 +37,6 @@ SRCS= rthread.c \ sched_prio.c SRCDIR= ${.CURDIR}/../libpthread -.include "${SRCDIR}/include/Makefile.inc" .include "${SRCDIR}/man/Makefile.inc" .include <bsd.lib.mk> |