diff options
| author | lukem <lukem@NetBSD.org> | 2002-08-19 09:41:27 +0000 |
|---|---|---|
| committer | lukem <lukem@NetBSD.org> | 2002-08-19 09:41:27 +0000 |
| commit | ebb6fc9eb8d577eb04388d4da60bf84e036089d1 (patch) | |
| tree | de21cc82230d882e6f428e93f90b12dd8f88260c /lib | |
| parent | 8b2ed6900d3aa7f224d5f3fe3f2bf8f813d54e56 (diff) | |
Use ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../../some/path (etc).
(Reduces make output by ~ 20%)
Diffstat (limited to 'lib')
39 files changed, 187 insertions, 145 deletions
diff --git a/lib/csu/common_elf/Makefile.inc b/lib/csu/common_elf/Makefile.inc index d44d797f9e6..4aff0ce9591 100644 --- a/lib/csu/common_elf/Makefile.inc +++ b/lib/csu/common_elf/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.17 2002/06/06 19:17:01 fvdl Exp $ +# $NetBSD: Makefile.inc,v 1.18 2002/08/19 09:41:27 lukem Exp $ .include <bsd.own.mk> @@ -9,9 +9,9 @@ ELFSIZE=32 .include "../../Makefile.inc" CPPFLAGS+= -DLIBC_SCCS -DPIC -DDYNAMIC -DELFSIZE=${ELFSIZE} -CPPFLAGS+= -I${.CURDIR}/../../../libexec/ld.elf_so +CPPFLAGS+= -I${NETBSDSRCDIR}/libexec/ld.elf_so CPPFLAGS+= -I${.CURDIR}/../common_elf -CPPFLAGS+= -I${.CURDIR}/../../libc/dlfcn +CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/dlfcn CPPFLAGS+= -DDWARF2_EH CPPFLAGS+= -DJCR CPPFLAGS+= -DDSO_HANDLE diff --git a/lib/i18n_module/Makefile.inc b/lib/i18n_module/Makefile.inc index 865083dd39f..0853f949996 100644 --- a/lib/i18n_module/Makefile.inc +++ b/lib/i18n_module/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2002/03/17 22:14:13 tshiozak Exp $ +# $NetBSD: Makefile.inc,v 1.2 2002/08/19 09:41:27 lukem Exp $ NOLINT= # defined NOPICINSTALL= # defined @@ -6,14 +6,14 @@ NOPROFILE= # defined .include <bsd.own.mk> -SHLIB_VERSION_FILE= ${.CURDIR}/../shlib_version +SHLIB_VERSION_FILE= ${NETBSDSRCDIR}/lib/i18n_module/shlib_version LIBDIR= /usr/lib/i18n SHLIBDIR= /usr/lib/i18n INTERNALLIB= yes -CPPFLAGS+= -I${.CURDIR}/../../libc/citrus +CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/citrus CPPFLAGS+= -DLOCALEMOD_MAJOR=${SHLIB_MAJOR} BASENAME!= basename ${.CURDIR} LIB= ${BASENAME} SRCS!= echo ${SRCPRE}${BASENAME}.c | tr A-Z a-z -.PATH: ${.CURDIR}/../../libc/citrus/modules +.PATH: ${NETBSDSRCDIR}/lib/libc/citrus/modules diff --git a/lib/libasn1/Makefile b/lib/libasn1/Makefile index 9849ef427ff..97d8d1522f7 100644 --- a/lib/libasn1/Makefile +++ b/lib/libasn1/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.19 2001/12/12 00:51:00 tv Exp $ +# $NetBSD: Makefile,v 1.20 2002/08/19 09:41:27 lukem Exp $ NOLINT= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/asn1 WARNS?= 1 @@ -100,8 +100,8 @@ SRCS= der_get.c \ CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/asn1 \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -I${DIST}/heimdal/lib/com_err \ -DHAVE_CONFIG_H diff --git a/lib/libasn1/asn1_compile/Makefile b/lib/libasn1/asn1_compile/Makefile index 956d91e4192..b7a0a7cdf3e 100644 --- a/lib/libasn1/asn1_compile/Makefile +++ b/lib/libasn1/asn1_compile/Makefile @@ -1,12 +1,15 @@ -# $NetBSD: Makefile,v 1.14 2001/12/12 00:51:00 tv Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/19 09:41:27 lukem Exp $ -DIST= ${.CURDIR}/../../../crypto/dist +NOLINT= # defined +NOMAN= # defined + +.include <bsd.own.mk> + +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/asn1 ${DIST}/heimdal/lib/roken ${DIST}/heimdal/lib/vers PROG= asn1_compile -NOLINT= # defined -NOMAN= # defined WARNS?= 1 asn1_compile_SRCS = \ @@ -39,14 +42,14 @@ YHEADER= # defined # -I${LIBROKEN} \ HOST_CPPFLAGS+= -I. \ - -I${.CURDIR}/../../../include/heimdal \ + -I${NETBSDSRCDIR}/include/heimdal \ -I${DIST}/heimdal/lib/asn1 \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H DPSRCS= print_version.h -make-print-version.lo: ${.CURDIR}/../../../include/heimdal/version.h +make-print-version.lo: ${NETBSDSRCDIR}/include/heimdal/version.h make-print-version: make-print-version.lo ${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC} diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile index 542dfca4756..a8172f292e0 100644 --- a/lib/libbz2/Makefile +++ b/lib/libbz2/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.8 2002/06/27 21:03:37 thorpej Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/19 09:41:28 lukem Exp $ + +NOMAN= # defined .include <bsd.own.mk> LIB= bz2 -NOMAN= # defined -DIST= ${.CURDIR}/../../dist/bzip2 +DIST= ${NETBSDSRCDIR}/dist/bzip2 .PATH: ${DIST} SRCS= blocksort.c huffman.c crctable.c randtable.c compress.c \ diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 3cb97bba70b..8f3a2fe5e50 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2002/07/20 08:51:32 yamt Exp $ +# $NetBSD: Makefile,v 1.106 2002/08/19 09:41:28 lukem Exp $ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # # All library objects contain sccsid strings by default; they may be @@ -98,7 +98,7 @@ INCSDIR= /usr/include NLS= C.msg Pig.msg cs.msg de.msg es.msg fi.msg fr.msg nl.msg no.msg \ sv.msg pl.msg -LIBKERN= ${.CURDIR}/../../sys/lib/libkern +LIBKERN= ${NETBSDSRCDIR}/sys/lib/libkern KSRCS= bcopy.c bcmp.c bswap16.c bswap32.c bswap64.c bzero.c ffs.c \ strcat.c strchr.c strcmp.c strcpy.c strlen.c \ diff --git a/lib/libc/dlfcn/Makefile.inc b/lib/libc/dlfcn/Makefile.inc index a0c2e9445bf..fcb240ca2bc 100644 --- a/lib/libc/dlfcn/Makefile.inc +++ b/lib/libc/dlfcn/Makefile.inc @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.1 2000/04/02 15:35:51 minoura Exp $ +# $NetBSD: Makefile.inc,v 1.2 2002/08/19 09:41:28 lukem Exp $ .PATH: ${.CURDIR}/dlfcn .if ${OBJECT_FMT} == "ELF" -CPPFLAGS+= -I${.CURDIR}/../../libexec/ld.elf_so +CPPFLAGS+= -I${NETBSDSRCDIR}/libexec/ld.elf_so CPPFLAGS+= -I${.CURDIR}/dlfcn SRCS+= dlfcn_elf.c .endif diff --git a/lib/libcdk/Makefile b/lib/libcdk/Makefile index e2865334745..3041b9851d6 100644 --- a/lib/libcdk/Makefile +++ b/lib/libcdk/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:01 tv Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:28 lukem Exp $ -DIST= ${.CURDIR}/../../dist +NOLINT= # defined + +.include <bsd.own.mk> + +DIST= ${NETBSDSRCDIR}/dist .PATH: ${DIST}/cdk ${DIST}/cdk/include ${DIST}/cdk/man LIB= cdk -NOLINT= # defined CPPFLAGS+= -I. -I${DIST}/cdk/include -DHAVE_CONFIG_H SRCS= alphalist.c binding.c buttonbox.c calendar.c cdk.c cdkscreen.c \ diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile index b3c300ea85d..7212c02c54a 100644 --- a/lib/libcom_err/Makefile +++ b/lib/libcom_err/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.11 2001/12/12 00:51:01 tv Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/19 09:41:29 lukem Exp $ NOLINT= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/com_err LIB= com_err @@ -32,8 +32,8 @@ compile_et: INCSDIR= /usr/include/krb5 CPPFLAGS+= -I. \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/com_err \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libcom_err/compile_et/Makefile b/lib/libcom_err/compile_et/Makefile index c7578492751..1be66057527 100644 --- a/lib/libcom_err/compile_et/Makefile +++ b/lib/libcom_err/compile_et/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2002/02/02 06:17:56 tv Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/19 09:41:29 lukem Exp $ NOMAN= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/com_err ${DIST}/heimdal/lib/roken ${DIST}/heimdal/lib/vers @@ -20,7 +20,7 @@ BINDIR= /usr/bin LIBROKEN!= cd ${.CURDIR}/../../libroken && ${PRINTOBJDIR} HOST_CPPFLAGS+= -I. \ - -I${.CURDIR}/../../../include/heimdal \ + -I${NETBSDSRCDIR}/include/heimdal \ -I${LIBROKEN} \ -I${DIST}/heimdal/lib/com_err \ -I${DIST}/heimdal/lib/roken \ @@ -28,7 +28,7 @@ HOST_CPPFLAGS+= -I. \ DPSRCS= print_version.h -make-print-version.lo: ${.CURDIR}/../../../include/heimdal/version.h +make-print-version.lo: ${NETBSDSRCDIR}/include/heimdal/version.h make-print-version: make-print-version.lo ${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC} diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile index 1e994e235dc..e1ad61608a0 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.25 2000/02/19 18:51:30 mycroft Exp $ +# $NetBSD: Makefile,v 1.26 2002/08/19 09:41:29 lukem Exp $ + +.include <bsd.own.mk> LIB= compat CPPFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -D__LIBCOMPAT_SOURCE__ -AINC= -I${.CURDIR}/../libc/arch/${MACHINE_ARCH} +AINC= -I${NETBSDSRCDIR}/lib/libc/arch/${MACHINE_ARCH} .if defined(DESTDIR) AINC+= -nostdinc -idirafter ${DESTDIR}/usr/include .endif diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index 3ec17f545c0..95ca4310b85 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/06/26 16:58:09 thorpej Exp $ +# $NetBSD: Makefile,v 1.23 2002/08/19 09:41:29 lukem Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -24,9 +24,9 @@ WARNS=0 LIB= crypto CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto -CRYPTODIST= ${.CURDIR}/../../crypto/dist +CRYPTODIST= ${NETBSDSRCDIR}/crypto/dist -.include "../../crypto/Makefile.openssl" +.include "${NETBSDSRCDIR}/crypto/Makefile.openssl" .PATH: ${OPENSSLSRC} .include "srcs.inc" diff --git a/lib/libcrypto/man/Makefile b/lib/libcrypto/man/Makefile index bdbbea6c550..b7f7d426f66 100644 --- a/lib/libcrypto/man/Makefile +++ b/lib/libcrypto/man/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.9 2002/06/09 16:13:00 itojun Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/19 09:41:29 lukem Exp $ # the makefile is not, and should not be visited during normal build process. # try to use latest pod2man, which comes with the latest perl. -CRYPTODIST= ${.CURDIR}/../../../crypto/dist +.include <bsd.own.mk> + +CRYPTODIST= ${NETBSDSRCDIR}/crypto/dist VERSION!= grep VERSION ${CRYPTODIST}/openssl/Makefile.ssl | head -1 | sed -e 's/VERSION=//' manpages: diff --git a/lib/libcrypto_idea/Makefile b/lib/libcrypto_idea/Makefile index 2d64d6d26a2..88a4b27ee53 100644 --- a/lib/libcrypto_idea/Makefile +++ b/lib/libcrypto_idea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:01 tv Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:30 lukem Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -28,9 +28,9 @@ WARNS= 0 LIB= crypto_idea CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto -CRYPTODIST= ${.CURDIR}/../../crypto/dist +CRYPTODIST= ${NETBSDSRCDIR}/crypto/dist -.include "../../crypto/Makefile.openssl" +.include "${NETBSDSRCDIR}/crypto/Makefile.openssl" .PATH: ${OPENSSLSRC} ${OPENSSLSRC}/crypto/idea ${OPENSSLSRC}/crypto/evp diff --git a/lib/libcrypto_rc5/Makefile b/lib/libcrypto_rc5/Makefile index 9fd0e91525d..a1bca7730a4 100644 --- a/lib/libcrypto_rc5/Makefile +++ b/lib/libcrypto_rc5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:02 tv Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:30 lukem Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -28,9 +28,9 @@ WARNS= 0 LIB= crypto_rc5 CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto -CRYPTODIST= ${.CURDIR}/../../crypto/dist +CRYPTODIST= ${NETBSDSRCDIR}/crypto/dist -.include "../../crypto/Makefile.openssl" +.include "${NETBSDSRCDIR}/crypto/Makefile.openssl" .PATH: ${OPENSSLSRC} ${OPENSSLSRC}/crypto/rc5 ${OPENSSLSRC}/crypto/evp diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile index 9f2d0e550a0..b162b9f669c 100644 --- a/lib/libcurses/Makefile +++ b/lib/libcurses/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.36 2002/07/19 13:22:41 blymn Exp $ +# $NetBSD: Makefile,v 1.37 2002/08/19 09:41:30 lukem Exp $ # @(#)Makefile 8.2 (Berkeley) 1/2/94 +.include <bsd.own.mk> + CPPFLAGS+=#-DTFILE=\"/dev/ttyp0\" -CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libterm +CPPFLAGS+=-I${.CURDIR} -I${NETBSDSRCDIR}/lib/libterm .if defined(DEBUG_CURSES) CFLAGS+=-g .if defined(FULL_DEBUG) @@ -27,7 +29,7 @@ INCSDIR=/usr/include CPPFLAGS+=-DCM_N -DCM_GT -DCM_B -DCM_D SRCS+= termcap.c tgoto.c tputs.c -.PATH: ${.CURDIR}/../libterm +.PATH: ${NETBSDSRCDIR}/lib/libterm .if make(install) SUBDIR+= PSD.doc diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile index 6688e943609..e190f2b7b67 100644 --- a/lib/libgssapi/Makefile +++ b/lib/libgssapi/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2001/12/12 00:51:02 tv Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/19 09:41:30 lukem Exp $ NOLINT= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/gssapi WARNS?= 1 @@ -65,8 +65,8 @@ CPPFLAGS+= -I. \ -I${DIST}/openssl/crypto \ -I${DIST}/heimdal/lib/asn1 \ -I${DIST}/heimdal/lib/com_err \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libhdb/Makefile b/lib/libhdb/Makefile index 53a305c3d9c..373cbf8334e 100644 --- a/lib/libhdb/Makefile +++ b/lib/libhdb/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2001/12/12 00:51:02 tv Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/19 09:41:30 lukem Exp $ NOLINT= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/hdb WARNS?= 1 @@ -62,8 +62,8 @@ CPPFLAGS+= -I. \ -I${DIST}/openssl/crypto \ -I${DIST}/heimdal/lib/asn1 \ -I${DIST}/heimdal/lib/com_err \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile index a3c9c41b6af..dc2af0c0824 100644 --- a/lib/libipsec/Makefile +++ b/lib/libipsec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/12/28 01:32:39 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/19 09:41:31 lukem Exp $ LIB= ipsec USE_SHLIBDIR= yes @@ -11,7 +11,7 @@ LPREFIX+=__libyy YPREFIX+=__libyy YHEADER=1 -#.PATH: ${.CURDIR}/../../sys/netkey +#.PATH: ${NETBSDSRCDIR}/sys/netkey #SRCS+= pfkey.c pfkey_dump.c #SRCS+= key_debug.c diff --git a/lib/libkadm/Makefile b/lib/libkadm/Makefile index 198e0e90305..4e98c226cdc 100644 --- a/lib/libkadm/Makefile +++ b/lib/libkadm/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2001/12/12 03:18:17 tv Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/19 09:41:31 lukem Exp $ NOLINT= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/krb4/lib/kadm WARNS?= 1 @@ -41,8 +41,8 @@ CPPFLAGS+= -I. \ -I${DIST}/openssl/crypto/des \ -I${DIST}/heimdal/lib/com_err \ -I${LIBKRBINC} \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libkadm5clnt/Makefile b/lib/libkadm5clnt/Makefile index a9573099cbf..b74e3541ddc 100644 --- a/lib/libkadm5clnt/Makefile +++ b/lib/libkadm5clnt/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.14 2001/12/12 00:51:03 tv Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/19 09:41:31 lukem Exp $ NOLINT= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/kadm5 WARNS?= 1 @@ -60,8 +60,8 @@ CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/hdb \ -I${DIST}/heimdal/lib/asn1 \ -I${DIST}/heimdal/lib/com_err \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libkadm5srv/Makefile b/lib/libkadm5srv/Makefile index c879bfd586c..d135a417983 100644 --- a/lib/libkadm5srv/Makefile +++ b/lib/libkadm5srv/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.14 2001/12/12 00:51:03 tv Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/19 09:41:31 lukem Exp $ NOLINT= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/kadm5 WARNS?= 1 @@ -79,8 +79,8 @@ CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/hdb \ -I${DIST}/heimdal/lib/asn1 \ -I${DIST}/heimdal/lib/com_err \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libkafs/Makefile b/lib/libkafs/Makefile index c768d07f39a..c74c7fcf8dd 100644 --- a/lib/libkafs/Makefile +++ b/lib/libkafs/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:03 tv Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:31 lukem Exp $ -DIST= ${.CURDIR}/../../crypto/dist +NOLINT= # defined + +.include <bsd.own.mk> + +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/kafs WARNS?= 1 -NOLINT= # defined LIB= kafs @@ -19,8 +22,8 @@ CPPFLAGS+= -I. \ -I${DESTDIR}/usr/include/krb5 \ -I${DESTDIR}/usr/include/kerberosIV \ -I${DESTDIR}/usr/include/openssl \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libkdb/Makefile b/lib/libkdb/Makefile index a27bfe0c95f..11ee9078bed 100644 --- a/lib/libkdb/Makefile +++ b/lib/libkdb/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:03 tv Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:32 lukem Exp $ NOLINT= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/krb4/lib/kdb WARNS?= 1 @@ -24,8 +24,8 @@ CPPFLAGS+= -I. \ -I${LIBKRBINC} \ -I${DIST}/krb4/lib/krb \ -I${DIST}/openssl/crypto/des \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libkrb/Makefile b/lib/libkrb/Makefile index 0f30da67358..70e3316e6a4 100644 --- a/lib/libkrb/Makefile +++ b/lib/libkrb/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.16 2001/12/12 00:51:04 tv Exp $ +# $NetBSD: Makefile,v 1.17 2002/08/19 09:41:32 lukem Exp $ NOLINT= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/krb4/lib/krb ${DIST}/krb4/doc \ ${DIST}/openssl/crypto/des ${DIST}/krb4/man @@ -124,8 +124,8 @@ CPPFLAGS+= -I. \ -I${DIST}/krb4/lib/krb \ -I${DIST}/openssl/crypto \ -I${DIST}/heimdal/lib/com_err \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H @@ -135,7 +135,7 @@ krb.h: krb.h.in sed 's,@DES_H@,openssl/des.h,' < ${.ALLSRC} > ${.TARGET} ktypes.h: - cp ${.CURDIR}/../../include/heimdal/$@ $@ + cp ${NETBSDSRCDIR}/include/heimdal/$@ $@ ${SRCS:.c=.o}: krb_err.h diff --git a/lib/libkrb5/Makefile b/lib/libkrb5/Makefile index 79575b0116c..fdec8ef9eea 100644 --- a/lib/libkrb5/Makefile +++ b/lib/libkrb5/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.21 2002/04/24 08:18:51 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2002/08/19 09:41:32 lukem Exp $ NOLINT= # defined .include <bsd.own.mk> -DIST= ${.CURDIR}/../../crypto/dist +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/krb5 ${DIST}/heimdal/doc WARNS?= 1 @@ -234,7 +234,7 @@ MLINKS= \ krb5_warn.3 krb5_set_warn_dest.3 krb5-types.h: - cp ${.CURDIR}/../../include/heimdal/$@ $@ + cp ${NETBSDSRCDIR}/include/heimdal/$@ $@ INCSDIR= /usr/include/krb5 @@ -246,8 +246,8 @@ CPPFLAGS+= -I. \ -I${ASN1} \ -I${DIST}/heimdal/lib/asn1 \ -I${DIST}/heimdal/lib/com_err \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libl/Makefile b/lib/libl/Makefile index f2f3cc7a580..8d66d087517 100644 --- a/lib/libl/Makefile +++ b/lib/libl/Makefile @@ -1,12 +1,16 @@ -# $NetBSD: Makefile,v 1.10 2001/12/27 11:39:20 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/19 09:41:32 lukem Exp $ + +NOPIC= # defined + +.include <bsd.own.mk> LIB= l SRCS= libmain.c libyywrap.c -NOPIC= # defined LINKS= ${LIBDIR}/libl.a ${LIBDIR}/libfl.a -.PATH: ${.CURDIR}/../../usr.bin/lex +.PATH: ${NETBSDSRCDIR}/usr.bin/lex + .include <bsd.lib.mk> .if ${MKPROFILE} != "no" diff --git a/lib/libm/arch/m68060/Makefile b/lib/libm/arch/m68060/Makefile index 24a2b51c651..396ff24a0e7 100644 --- a/lib/libm/arch/m68060/Makefile +++ b/lib/libm/arch/m68060/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2000/04/14 20:24:40 is Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/19 09:41:32 lukem Exp $ -M060SP= ../../../../sys/arch/m68k/060sp +.include <bsd.own.mk> + +M060SP= ${NETBSDSRCDIR}/sys/arch/m68k/060sp ASM2GAS= ${M060SP}/asm2gas FPLSP_SA= ${M060SP}/dist/fplsp.sa diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index 60b3dd8c72f..11016281bf4 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2001/11/05 15:22:37 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2002/08/19 09:41:33 lukem Exp $ + +.include <bsd.own.mk> LIB= pcap MAN= pcap.3 @@ -21,7 +23,7 @@ SRCS= scanner.l savefile.c pcap.c pcap-bpf.c optimize.c nametoaddr.c \ inet.c grammar.y gencode.c etherent.c bpf_image.c SRCS+= bpf_filter.c version.c -.PATH: ${.CURDIR}/../../sys/net +.PATH: ${NETBSDSRCDIR}/sys/net INCS= pcap-namedb.h pcap.h INCSDIR=/usr/include diff --git a/lib/libpci/Makefile b/lib/libpci/Makefile index 1e9a73111c9..c3dbb353c11 100644 --- a/lib/libpci/Makefile +++ b/lib/libpci/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2001/09/13 22:52:19 thorpej Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/19 09:41:33 lukem Exp $ + +.include <bsd.own.mk> LIB= pci @@ -6,7 +8,7 @@ SRCS= pci_bus.c pci_device.c pci_subr.c CPPFLAGS+=-DPCIVERBOSE -.PATH.c: ${.CURDIR}/../../sys/dev/pci +.PATH.c: ${NETBSDSRCDIR}/sys/dev/pci MAN= pci.3 diff --git a/lib/libposix/Makefile b/lib/libposix/Makefile index d0502241aa4..f095317eab3 100644 --- a/lib/libposix/Makefile +++ b/lib/libposix/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.9 2001/11/13 18:55:00 tv Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/19 09:41:33 lukem Exp $ LIB= posix .include <bsd.own.mk> -CPPFLAGS+=-D_REENTRANT -I${.CURDIR}/../libc/include -.if exists(${.CURDIR}/../libc/arch/${MACHINE_ARCH}) -ARCHDIR= ${.CURDIR}/../libc/arch/${MACHINE_ARCH} -.elif exists(${.CURDIR}/../libc/arch/${MACHINE_CPU}) -ARCHDIR= ${.CURDIR}/../libc/arch/${MACHINE_CPU} +CPPFLAGS+=-D_REENTRANT -I${NETBSDSRCDIR}/lib/libc/include +.if exists(${NETBSDSRCDIR}/lib/libc/arch/${MACHINE_ARCH}) +ARCHDIR= ${NETBSDSRCDIR}/lib/libc/arch/${MACHINE_ARCH} +.elif exists(${NETBSDSRCDIR}/lib/libc/arch/${MACHINE_CPU}) +ARCHDIR= ${NETBSDSRCDIR}/lib/libc/arch/${MACHINE_CPU} .else .BEGIN: @echo no ARCHDIR for ${MACHINE_ARCH} nor ${MACHINE_CPU} diff --git a/lib/libposix/sys/Makefile.inc b/lib/libposix/sys/Makefile.inc index e432cf4ab8f..f451f1e92f9 100644 --- a/lib/libposix/sys/Makefile.inc +++ b/lib/libposix/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.13 2002/01/29 19:03:01 tv Exp $ +# $NetBSD: Makefile.inc,v 1.14 2002/08/19 09:41:33 lukem Exp $ # sys sources .PATH: ${.CURDIR}/sys @@ -19,7 +19,7 @@ LSRCS+= LintSysPseudo.c DPSRCS+= LintSysPseudo.c .endif -LintSysPseudo.c: ${.CURDIR}/../libc/sys/makelintstub \ +LintSysPseudo.c: ${NETBSDSRCDIR}/lib/libc/sys/makelintstub \ ${DESTDIR}/usr/include/sys/syscall.h - sh ${.CURDIR}/../libc/sys/makelintstub -o ${.TARGET} -p \ + sh ${NETBSDSRCDIR}/lib/libc/sys/makelintstub -o ${.TARGET} -p \ -s ${DESTDIR}/usr/include/sys/syscall.h ${PSEUDO} diff --git a/lib/libresolv/Makefile b/lib/libresolv/Makefile index 6cb616f7f46..79ec0f071b3 100644 --- a/lib/libresolv/Makefile +++ b/lib/libresolv/Makefile @@ -1,12 +1,14 @@ -# $NetBSD: Makefile,v 1.8 2000/01/31 15:42:34 christos Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/19 09:41:33 lukem Exp $ # from: @(#)Makefile 5.1 (Berkeley) 6/5/90 +.include <bsd.own.mk> + LIB=resolv -CPPFLAGS+=-DDEBUG -DLIBC_SCCS -I${.CURDIR}/../libc/include +CPPFLAGS+=-DDEBUG -DLIBC_SCCS -I${NETBSDSRCDIR}/lib/libc/include CPPFLAGS+=-DRESOLVSORT CPPFLAGS+=-DINET6 -.PATH: ${.CURDIR}/../libc/net +.PATH: ${NETBSDSRCDIR}/lib/libc/net SRCS=gethnamaddr.c res_mkquery.c res_query.c res_send.c diff --git a/lib/libroken/Makefile b/lib/libroken/Makefile index 2bd26112427..8531edf6b7f 100644 --- a/lib/libroken/Makefile +++ b/lib/libroken/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.11 2001/12/12 00:51:05 tv Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/19 09:41:34 lukem Exp $ -DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/roken ${.CURDIR}/../../include/heimdal +NOLINT= # defined + +.include <bsd.own.mk> + +DIST= ${NETBSDSRCDIR}/crypto/dist +.PATH: ${DIST}/heimdal/lib/roken ${NETBSDSRCDIR}/include/heimdal WARNS?= 1 -NOLINT= # defined LIB= roken @@ -59,10 +62,10 @@ INCS= base64.h getarg.h parse_bytes.h parse_time.h parse_units.h \ INCSDIR= /usr/include/krb5 CPPFLAGS+= -I. \ - -I${.CURDIR}/../../include/heimdal \ + -I${NETBSDSRCDIR}/include/heimdal \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -HOST_CPPFLAGS+= -I${.CURDIR}/../../include/heimdal -DHAVE_CONFIG_H +HOST_CPPFLAGS+= -I${NETBSDSRCDIR}/include/heimdal -DHAVE_CONFIG_H .include <bsd.lib.mk> diff --git a/lib/libsl/Makefile b/lib/libsl/Makefile index 7dfc021a4ba..9f287e3834b 100644 --- a/lib/libsl/Makefile +++ b/lib/libsl/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:05 tv Exp $ - -DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/sl +# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:34 lukem Exp $ NOLINT= # defined +.include <bsd.own.mk> + +DIST= ${NETBSDSRCDIR}/crypto/dist +.PATH: ${DIST}/heimdal/lib/sl + LIB= sl SRCS= sl.c INCS= sl.h @@ -12,8 +14,8 @@ INCSDIR= /usr/include/krb5 CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/sl \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../../lib/libroken \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libss/Makefile b/lib/libss/Makefile index c8777c43be0..355477ef2d7 100644 --- a/lib/libss/Makefile +++ b/lib/libss/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.3 2001/12/12 00:51:02 tv Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/19 09:41:34 lukem Exp $ -DIST= ${.CURDIR}/../../crypto/dist +NOLINT= # defined + +.include <bsd.own.mk> + +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/sl WARNS?= 1 -NOLINT= # defined LIB= ss SRCS= sl.c ss.c @@ -13,10 +16,10 @@ INCSDIR= /usr/include/krb5 CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/sl \ - -I${.CURDIR}/../../include/heimdal \ - -I${.CURDIR}/../../lib/libcom_err \ + -I${NETBSDSRCDIR}/include/heimdal \ + -I${NETBSDSRCDIR}/lib/libcom_err \ -I${DIST}/heimdal/lib/com_err \ - -I${.CURDIR}/../../lib/libroken \ + -I${NETBSDSRCDIR}/lib/libroken \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile index 7b376ea366c..c92832d8daa 100644 --- a/lib/libssl/Makefile +++ b/lib/libssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/11/21 17:33:26 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:34 lukem Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -16,15 +16,17 @@ # sjg@quick.com.au # +.include <bsd.own.mk> + # XXX There's a bit of work to do before we can enable warnings. WARNS=0 LIB= ssl CFLAGS+= -Dlib${LIB} -CRYPTODIST= ${.CURDIR}/../../crypto/dist +CRYPTODIST= ${NETBSDSRCDIR}/crypto/dist -.include "../../crypto/Makefile.openssl" +.include "${NETBSDSRCDIR}/crypto/Makefile.openssl" .PATH: ${OPENSSLSRC} .include "srcs.inc" diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index f4f1a5e5cb7..47234a93e27 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2002/08/08 16:50:38 abs Exp $ +# $NetBSD: Makefile,v 1.34 2002/08/19 09:41:34 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 +.include <bsd.own.mk> + LIB= util USE_SHLIBDIR= yes CPPFLAGS+=-DLIBC_SCCS @@ -14,7 +16,7 @@ MAN= fparseln.3 getbootfile.3 getmaxpartitions.3 getrawpartition.3 \ openpty.3 pidfile.3 pidlock.3 pw_getconf.3 pw_init.3 pw_lock.3 \ secure_path.3 ttyaction.3 ttymsg.3 util.3 -.PATH: ${.CURDIR}/../libc/gen +.PATH: ${NETBSDSRCDIR}/lib/libc/gen MLINKS+=login.3 logout.3 MLINKS+=login.3 logwtmp.3 diff --git a/lib/libvers/Makefile b/lib/libvers/Makefile index 4126ad2f324..4587f36dc0e 100644 --- a/lib/libvers/Makefile +++ b/lib/libvers/Makefile @@ -1,29 +1,31 @@ -# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:06 tv Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:35 lukem Exp $ -DIST= ${.CURDIR}/../../crypto/dist +NOLINKLIB= # defined +NOPIC= # defined +NOPROFILE= # defined + +.include <bsd.own.mk> + +DIST= ${NETBSDSRCDIR}/crypto/dist .PATH: ${DIST}/heimdal/lib/vers MKLINT= # defined LIB= vers -NOLINKLIB= # defined -NOPIC= # defined -NOPROFILE= # defined - includes: print_version.h SRCS= print_version.c DPSRCS= print_version.h CPPFLAGS+= -I. \ - -I${.CURDIR}/../../include/heimdal \ + -I${NETBSDSRCDIR}/include/heimdal \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -HOST_CPPFLAGS+= -I${.CURDIR}/../../include/heimdal -DHAVE_CONFIG_H +HOST_CPPFLAGS+= -I${NETBSDSRCDIR}/include/heimdal -DHAVE_CONFIG_H -make-print-version.lo: ${.CURDIR}/../../include/heimdal/version.h +make-print-version.lo: ${NETBSDSRCDIR}/include/heimdal/version.h make-print-version: make-print-version.lo ${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC} |
