From 2979ca23937f55308c22a0cf2acb66a4525843c0 Mon Sep 17 00:00:00 2001 From: Peter Galbavy Date: Tue, 21 Jul 1998 13:54:06 +0000 Subject: fix up those 13 broken merges --- lib/libpthread/Makefile | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'lib/libpthread/Makefile') diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index 594cb54326f..0af5927b9b2 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -1,21 +1,17 @@ -# from: @(#)Makefile 5.2 (Berkeley) 3/5/91 +# Generated automatically from Makefile.in by configure. +# @(#)Makefile 5.2 (Berkeley) 3/5/91 +# LIB=pthread NOPIC= no CPPFLAGS+= -DPTHREAD_KERNEL -I. -I${.CURDIR}/include -I${.CURDIR}/arch/${MACHINE_ARCH} -.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" -.include "${.CURDIR}/pthreads/Makefile.inc" -.include "${.CURDIR}/stdio/Makefile.inc" +.include "${srcdir}/pthreads/Makefile.inc" +.include "${srcdir}/stdlib/Makefile.inc" +.include "${srcdir}/stdio/Makefile.inc" +.include "${srcdir}/string/Makefile.inc" +.include "${srcdir}/gen/Makefile.inc" +.include "${srcdir}/net/Makefile.inc" +.include "${srcdir}/scripts/Makefile.inc" -all beforedepend: pthread - -CLEANFILES+=pthread - -pthread: - if [ ! -e pthread ]; then \ - ln -s ${.CURDIR}/include pthread; \ - fi - .include - -- cgit v1.2.3