summaryrefslogtreecommitdiff
path: root/gnu/lib/libstdc++
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2002-08-19 09:46:39 +0000
committerlukem <lukem@NetBSD.org>2002-08-19 09:46:39 +0000
commit8f96758140d1687d4fb5eeece70194bddc27b623 (patch)
tree47ab12cc46895c12fa07f31dad2dd3b5003c7ef5 /gnu/lib/libstdc++
parentebb6fc9eb8d577eb04388d4da60bf84e036089d1 (diff)
Use ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../../../some/path (etc).
(Reduces make output by ~ 20%)
Diffstat (limited to 'gnu/lib/libstdc++')
-rw-r--r--gnu/lib/libstdc++/Makefile9
-rw-r--r--gnu/lib/libstdc++/config/Makefile4
-rw-r--r--gnu/lib/libstdc++/include/Makefile5
-rw-r--r--gnu/lib/libstdc++/io/Makefile7
-rw-r--r--gnu/lib/libstdc++/std/Makefile10
-rw-r--r--gnu/lib/libstdc++/stl/Makefile10
6 files changed, 23 insertions, 22 deletions
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 472c37ae143..cb26b4d9d50 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/02/28 02:13:34 tv Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/19 09:46:41 lukem Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -17,8 +17,7 @@ SHLIB_MINOR= 0
SUBDIR= include io config
-TOP= ${.CURDIR}/../..
-DIST= ${TOP}/dist/toolchain
+DIST= ${NETBSDSRCDIR}/gnu/dist/toolchain
SRCS= ${G_OBJS:.o=.cc} ${G_LIBIBERTY_OBJS:.o=.c}
INCS= _G_config.h
@@ -37,7 +36,7 @@ GCPPFLAGS= ${G_XCFLAGS} ${G_CINCLUDES} ${G_MT_CFLAGS} ${G_CXXINCLUDES}
CPPFLAGS+= -nostdinc++ -I${.CURDIR}/arch/${MACHINE_ARCH} \
${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} \
-I${DIST}/gcc/cp/inc \
- -I${.CURDIR}/../libiberty -I${DIST}/include
+ -I${NETBSDSRCDIR}/gnu/lib/libiberty -I${DIST}/include
CXXFLAGS+= ${G_XCXXFLAGS:M-f*}
@@ -115,7 +114,7 @@ SRCS= PlotFile.cc SFile.cc builtinbuf.cc editbuf.cc filebuf.cc fstream.cc \
outfloat.c peekc.c strops.c \
cmathi.cc cstdlibi.cc cstringi.cc stdexcepti.cc stlinst.cc
-DIST= ${.CURDIR}/../../dist
+DIST= ${NETBSDSRCDIR}/gnu/dist
CPPFLAGS+= -I${DESTDIR}/usr/include/g++ -I${DIST}/libstdc++
TEXINFO= iostream.texi
diff --git a/gnu/lib/libstdc++/config/Makefile b/gnu/lib/libstdc++/config/Makefile
index 6fcfcb67970..80c463678cf 100644
--- a/gnu/lib/libstdc++/config/Makefile
+++ b/gnu/lib/libstdc++/config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/12/30 17:21:19 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/19 09:46:42 lukem Exp $
# Makefile for _G_config.h, a machine-dependent automatically generated
# configuration file.
@@ -17,7 +17,7 @@ INCSDIR= /usr/include/${MACHINE}
DPSRCS= _G_config.h
CLEANFILES= dummy.c dummy.h dummy.C _G_config.h
-DIST= ${.CURDIR}/../../../dist
+DIST= ${NETBSDSRCDIR}/gnu/dist
.ifdef DESTDIR
LDPRE= -nostdlib -L${DESTDIR}${SHLIBDIR} -L${DESTDIR}/usr/lib \
diff --git a/gnu/lib/libstdc++/include/Makefile b/gnu/lib/libstdc++/include/Makefile
index 623951adb25..618def55f4d 100644
--- a/gnu/lib/libstdc++/include/Makefile
+++ b/gnu/lib/libstdc++/include/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2001/07/24 19:44:50 tv Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/19 09:46:42 lukem Exp $
.include <bsd.own.mk>
@@ -10,8 +10,7 @@
.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
-TOP= ${.CURDIR}/../../..
-DIST= ${TOP}/dist/toolchain
+DIST= ${NETBSDSRCDIR}/gnu/dist/toolchain
INCS= ${G_HEADERS} ${STD_HEADERS} ${STL_HEADERS}
INCSDIR= /usr/include/g++
diff --git a/gnu/lib/libstdc++/io/Makefile b/gnu/lib/libstdc++/io/Makefile
index 120c676652a..c2e819663f0 100644
--- a/gnu/lib/libstdc++/io/Makefile
+++ b/gnu/lib/libstdc++/io/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/12/19 20:52:11 tv Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/19 09:46:42 lukem Exp $
NOOBJ= # defined
@@ -12,8 +12,7 @@ NOOBJ= # defined
.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
-TOP= ${.CURDIR}/../../..
-DIST= ${TOP}/dist/toolchain
+DIST= ${NETBSDSRCDIR}/gnu/dist/toolchain
INCS= ${LIBIO_HEADERS:Niostdio.h}
INCSDIR= /usr/include/g++
@@ -31,7 +30,7 @@ INCS= PlotFile.h SFile.h builtinbuf.h editbuf.h floatio.h fstream.h \
procbuf.h stdiostream.h stream.h streambuf.h strfile.h strstream.h
INCSDIR=/usr/include/g++
-.PATH: ${.CURDIR}/../../../dist/libio
+.PATH: ${NETBSDSRCDIR}/gnu/dist/libio
.include <bsd.prog.mk>
diff --git a/gnu/lib/libstdc++/std/Makefile b/gnu/lib/libstdc++/std/Makefile
index bbdf4e3f4d6..04c874e924b 100644
--- a/gnu/lib/libstdc++/std/Makefile
+++ b/gnu/lib/libstdc++/std/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2001/12/12 01:48:59 tv Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/19 09:46:42 lukem Exp $
+
+NOOBJ= # defined
+
+.include <bsd.own.mk>
INCS= bastring.cc bastring.h complext.cc complext.h dcomplex.h fcomplex.h \
ldcomplex.h straits.h
INCS+= bastring_inst.h complext_inst.h
INCSDIR=/usr/include/g++/std
-NOOBJ= # defined
-
-.PATH: ${.CURDIR}/../../../dist/libstdc++/std
+.PATH: ${NETBSDSRCDIR}/gnu/dist/libstdc++/std
.include <bsd.prog.mk>
diff --git a/gnu/lib/libstdc++/stl/Makefile b/gnu/lib/libstdc++/stl/Makefile
index 59a6fa5bfd4..b05b05aecfd 100644
--- a/gnu/lib/libstdc++/stl/Makefile
+++ b/gnu/lib/libstdc++/stl/Makefile
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/12/12 01:48:59 tv Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/19 09:46:43 lukem Exp $
+
+NOOBJ= # defined
+
+.include <bsd.own.mk>
INCS= algorithm deque functional hash_map hash_set iterator list map \
memory numeric pthread_alloc queue rope set slist stack utility \
@@ -16,9 +20,7 @@ INCS= algorithm deque functional hash_map hash_set iterator list map \
tempbuf.h tree.h type_traits.h vector.h
INCSDIR=/usr/include/g++
-NOOBJ= # defined
-
-.PATH: ${.CURDIR}/../../../dist/libstdc++/stl
+.PATH: ${NETBSDSRCDIR}/gnu/dist/libstdc++/stl
.SUFFIXES: