Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib Use ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../....
details: https://anonhg.NetBSD.org/src/rev/33c2b8dde08d
branches: trunk
changeset: 535445:33c2b8dde08d
user: lukem <lukem%NetBSD.org@localhost>
date: Mon Aug 19 09:41:27 2002 +0000
description:
Use ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../../some/path (etc).
(Reduces make output by ~ 20%)
diffstat:
lib/csu/common_elf/Makefile.inc | 6 +++---
lib/i18n_module/Makefile.inc | 8 ++++----
lib/libasn1/Makefile | 8 ++++----
lib/libasn1/asn1_compile/Makefile | 15 +++++++++------
lib/libbz2/Makefile | 7 ++++---
lib/libc/Makefile | 4 ++--
lib/libc/dlfcn/Makefile.inc | 4 ++--
lib/libcdk/Makefile | 9 ++++++---
lib/libcom_err/Makefile | 8 ++++----
lib/libcom_err/compile_et/Makefile | 8 ++++----
lib/libcompat/Makefile | 6 ++++--
lib/libcrypto/Makefile | 6 +++---
lib/libcrypto/man/Makefile | 6 ++++--
lib/libcrypto_idea/Makefile | 6 +++---
lib/libcrypto_rc5/Makefile | 6 +++---
lib/libcurses/Makefile | 8 +++++---
lib/libgssapi/Makefile | 8 ++++----
lib/libhdb/Makefile | 8 ++++----
lib/libipsec/Makefile | 4 ++--
lib/libkadm/Makefile | 8 ++++----
lib/libkadm5clnt/Makefile | 8 ++++----
lib/libkadm5srv/Makefile | 8 ++++----
lib/libkafs/Makefile | 13 ++++++++-----
lib/libkdb/Makefile | 8 ++++----
lib/libkrb/Makefile | 10 +++++-----
lib/libkrb5/Makefile | 10 +++++-----
lib/libl/Makefile | 10 +++++++---
lib/libm/arch/m68060/Makefile | 6 ++++--
lib/libpcap/Makefile | 6 ++++--
lib/libpci/Makefile | 6 ++++--
lib/libposix/Makefile | 12 ++++++------
lib/libposix/sys/Makefile.inc | 6 +++---
lib/libresolv/Makefile | 8 +++++---
lib/libroken/Makefile | 15 +++++++++------
lib/libsl/Makefile | 14 ++++++++------
lib/libss/Makefile | 15 +++++++++------
lib/libssl/Makefile | 8 +++++---
lib/libutil/Makefile | 6 ++++--
lib/libvers/Makefile | 20 +++++++++++---------
39 files changed, 187 insertions(+), 145 deletions(-)
diffs (truncated from 986 to 300 lines):
diff -r d3f9e566372a -r 33c2b8dde08d lib/csu/common_elf/Makefile.inc
--- a/lib/csu/common_elf/Makefile.inc Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/csu/common_elf/Makefile.inc Mon Aug 19 09:41:27 2002 +0000
@@ -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 @@
.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 -r d3f9e566372a -r 33c2b8dde08d lib/i18n_module/Makefile.inc
--- a/lib/i18n_module/Makefile.inc Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/i18n_module/Makefile.inc Mon Aug 19 09:41:27 2002 +0000
@@ -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 @@
.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 -r d3f9e566372a -r 33c2b8dde08d lib/libasn1/Makefile
--- a/lib/libasn1/Makefile Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libasn1/Makefile Mon Aug 19 09:41:27 2002 +0000
@@ -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 @@
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 -r d3f9e566372a -r 33c2b8dde08d lib/libasn1/asn1_compile/Makefile
--- a/lib/libasn1/asn1_compile/Makefile Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libasn1/asn1_compile/Makefile Mon Aug 19 09:41:27 2002 +0000
@@ -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 @@
# -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 -r d3f9e566372a -r 33c2b8dde08d lib/libbz2/Makefile
--- a/lib/libbz2/Makefile Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libbz2/Makefile Mon Aug 19 09:41:27 2002 +0000
@@ -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 -r d3f9e566372a -r 33c2b8dde08d lib/libc/Makefile
--- a/lib/libc/Makefile Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libc/Makefile Mon Aug 19 09:41:27 2002 +0000
@@ -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 @@
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 -r d3f9e566372a -r 33c2b8dde08d lib/libc/dlfcn/Makefile.inc
--- a/lib/libc/dlfcn/Makefile.inc Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libc/dlfcn/Makefile.inc Mon Aug 19 09:41:27 2002 +0000
@@ -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 -r d3f9e566372a -r 33c2b8dde08d lib/libcdk/Makefile
--- a/lib/libcdk/Makefile Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libcdk/Makefile Mon Aug 19 09:41:27 2002 +0000
@@ -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 $
+
+NOLINT= # defined
-DIST= ${.CURDIR}/../../dist
+.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 -r d3f9e566372a -r 33c2b8dde08d lib/libcom_err/Makefile
--- a/lib/libcom_err/Makefile Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libcom_err/Makefile Mon Aug 19 09:41:27 2002 +0000
@@ -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 @@
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 -r d3f9e566372a -r 33c2b8dde08d lib/libcom_err/compile_et/Makefile
--- a/lib/libcom_err/compile_et/Makefile Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libcom_err/compile_et/Makefile Mon Aug 19 09:41:27 2002 +0000
@@ -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 @@
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 @@
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 -r d3f9e566372a -r 33c2b8dde08d lib/libcompat/Makefile
--- a/lib/libcompat/Makefile Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libcompat/Makefile Mon Aug 19 09:41:27 2002 +0000
@@ -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 -r d3f9e566372a -r 33c2b8dde08d lib/libcrypto/Makefile
--- a/lib/libcrypto/Makefile Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libcrypto/Makefile Mon Aug 19 09:41:27 2002 +0000
@@ -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 @@
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 -r d3f9e566372a -r 33c2b8dde08d lib/libcrypto/man/Makefile
--- a/lib/libcrypto/man/Makefile Mon Aug 19 07:23:22 2002 +0000
+++ b/lib/libcrypto/man/Makefile Mon Aug 19 09:41:27 2002 +0000
@@ -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=//'
Home |
Main Index |
Thread Index |
Old Index