Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Prefix all target-specific things with `${MACHINE_GNU_PLATFO...
details: https://anonhg.NetBSD.org/src/rev/8445ae35196f
branches: trunk
changeset: 517559:8445ae35196f
user: tv <tv%NetBSD.org@localhost>
date: Wed Nov 14 22:13:39 2001 +0000
description:
Prefix all target-specific things with `${MACHINE_GNU_PLATFORM}-'.
Prefix all non-target-specific things with `nb'.
diffstat:
share/mk/bsd.own.mk | 52 ++++++++++++++++++++++----------------------
tools/asn1_compile/Makefile | 3 +-
tools/autoconf/Makefile | 3 +-
tools/binstall/Makefile | 6 ++--
tools/compile_et/Makefile | 3 +-
tools/config/Makefile | 3 +-
tools/crunchgen/Makefile | 3 +-
tools/gencat/Makefile | 3 +-
tools/groff/Makefile | 9 ++++++-
tools/lex/Makefile | 3 +-
tools/lorder/Makefile | 8 ++----
tools/m4/Makefile | 3 +-
tools/menuc/Makefile | 4 +-
tools/mkdep/Makefile | 3 +-
tools/mklocale/Makefile | 3 +-
tools/msgc/Makefile | 4 +-
tools/mtree/Makefile | 3 +-
tools/rpcgen/Makefile | 3 +-
tools/texinfo/Makefile | 4 ++-
tools/toolchain/Makefile | 12 +++------
tools/tsort/Makefile | 3 +-
tools/yacc/Makefile | 3 +-
22 files changed, 79 insertions(+), 62 deletions(-)
diffs (truncated from 367 to 300 lines):
diff -r f5946690e994 -r 8445ae35196f share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Wed Nov 14 22:07:03 2001 +0000
+++ b/share/mk/bsd.own.mk Wed Nov 14 22:13:39 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.216 2001/11/14 19:46:38 thorpej Exp $
+# $NetBSD: bsd.own.mk,v 1.217 2001/11/14 22:13:43 tv Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -76,46 +76,46 @@
# Define default locations for common tools.
AR= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar
AS= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-as
-ASN1_COMPILE= ${TOOLDIR}/bin/asn1_compile
+ASN1_COMPILE= ${TOOLDIR}/bin/nbasn1_compile
CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
-COMPILE_ET= ${TOOLDIR}/bin/compile_et
-CONFIG= ${TOOLDIR}/bin/config
+COMPILE_ET= ${TOOLDIR}/bin/nbcompile_et
+CONFIG= ${TOOLDIR}/bin/nbconfig
CPP= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-cpp
-CRUNCHGEN= MAKE=${.MAKE:Q} ${TOOLDIR}/bin/crunchgen
+CRUNCHGEN= MAKE=${.MAKE:Q} ${TOOLDIR}/bin/nbcrunchgen
CXX= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-c++
DBSYM= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-dbsym
-EQN= ${TOOLDIR}/bin/eqn
+EQN= ${TOOLDIR}/bin/nbeqn
FC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-g77
-GENCAT= ${TOOLDIR}/bin/gencat
-#GRIND= ${TOOLDIR}/bin/vgrind -f
-GROFF= ${TOOLDIR}/bin/groff
-INDXBIB= ${TOOLDIR}/bin/indxbib
-INSTALL= STRIP=${STRIP:Q} ${TOOLDIR}/bin/binstall
-INSTALL_INFO= ${TOOLDIR}/bin/install-info
+GENCAT= ${TOOLDIR}/bin/nbgencat
+#GRIND= ${TOOLDIR}/bin/nbvgrind -f
+GROFF= ${TOOLDIR}/bin/nbgroff
+INDXBIB= ${TOOLDIR}/bin/nbindxbib
+INSTALL= STRIP=${STRIP:Q} ${TOOLDIR}/bin/nbinstall
+INSTALL_INFO= ${TOOLDIR}/bin/nbinstall-info
LD= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ld
-LEX= ${TOOLDIR}/bin/lex
+LEX= ${TOOLDIR}/bin/nblex
LINT= CC=${CC:Q} ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-lint
-LORDER= NM=${NM:Q} ${TOOLDIR}/bin/lorder
+LORDER= NM=${NM:Q} ${TOOLDIR}/bin/nblorder
MAKEINFO= ${TOOLDIR}/bin/makeinfo
MDSETIMAGE= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-mdsetimage
-MENUC= MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/menuc
-MKDEP= CC=${CC:Q} ${TOOLDIR}/bin/mkdep
-MKLOCALE= ${TOOLDIR}/bin/mklocale
-MSGC= MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/msgc
-MTREE= ${TOOLDIR}/bin/mtree
+MENUC= MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/nbmenuc
+MKDEP= CC=${CC:Q} ${TOOLDIR}/bin/nbmkdep
+MKLOCALE= ${TOOLDIR}/bin/nbmklocale
+MSGC= MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/nbmsgc
+MTREE= ${TOOLDIR}/bin/nbmtree
NM= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-nm
OBJC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
OBJCOPY= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-objcopy
-PIC= ${TOOLDIR}/bin/pic
+PIC= ${TOOLDIR}/bin/nbpic
RANLIB= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib
-REFER= ${TOOLDIR}/bin/refer
-RPCGEN= ${TOOLDIR}/bin/rpcgen
+REFER= ${TOOLDIR}/bin/nbrefer
+RPCGEN= ${TOOLDIR}/bin/nbrpcgen
SIZE= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-size
-SOELIM= ${TOOLDIR}/bin/soelim
+SOELIM= ${TOOLDIR}/bin/nbsoelim
STRIP= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip
-TBL= ${TOOLDIR}/bin/tbl
-TSORT= ${TOOLDIR}/bin/tsort -q
-YACC= ${TOOLDIR}/bin/yacc
+TBL= ${TOOLDIR}/bin/nbtbl
+TSORT= ${TOOLDIR}/bin/nbtsort -q
+YACC= ${TOOLDIR}/bin/nbyacc
# Make sure DESTDIR is set, so that builds with these tools always
# get appropriate -nostdinc, -nostdlib, etc. handling. The default is
diff -r f5946690e994 -r 8445ae35196f tools/asn1_compile/Makefile
--- a/tools/asn1_compile/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/asn1_compile/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/11/12 23:16:24 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/14 22:13:39 tv Exp $
+HOSTPROGNAME= nbasn1_compile
HOST_SRCDIR= lib/libasn1/asn1_compile
.include "${.CURDIR}/../Makefile.host"
diff -r f5946690e994 -r 8445ae35196f tools/autoconf/Makefile
--- a/tools/autoconf/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/autoconf/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2001/11/14 20:05:24 tv Exp $
+# $NetBSD: Makefile,v 1.2 2001/11/14 22:13:39 tv Exp $
MODULE= autoconf
+CONFIGURE_ARGS= --program-prefix=nb
CONFIGURE_ENV= M4="${TOOLDIR}/bin/m4 -g -D__gnu__"
.include "${.CURDIR}/../Makefile.gnuhost"
diff -r f5946690e994 -r 8445ae35196f tools/binstall/Makefile
--- a/tools/binstall/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/binstall/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/11/12 23:16:25 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/14 22:13:39 tv Exp $
-HOSTPROG= binstall
+HOSTPROGNAME= nbinstall
HOST_SRCDIR= usr.bin/xinstall
.include "${.CURDIR}/../Makefile.host"
-INSTALL= ./binstall
+INSTALL= ./xinstall
diff -r f5946690e994 -r 8445ae35196f tools/compile_et/Makefile
--- a/tools/compile_et/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/compile_et/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/11/12 23:16:25 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/14 22:13:39 tv Exp $
+HOSTPROGNAME= nbcompile_et
HOST_SRCDIR= usr.bin/compile_et
HOST_SRCS= getarg.c print_version.c warnerr.c strupr.c get_window_size.c
HOST_CPPFLAGS= -I${DIST}/heimdal/lib/roken
diff -r f5946690e994 -r 8445ae35196f tools/config/Makefile
--- a/tools/config/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/config/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/11/12 23:16:26 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/14 22:13:40 tv Exp $
+HOSTPROGNAME= nbconfig
HOST_SRCDIR= usr.sbin/config
.include "${.CURDIR}/../Makefile.host"
diff -r f5946690e994 -r 8445ae35196f tools/crunchgen/Makefile
--- a/tools/crunchgen/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/crunchgen/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2001/11/12 23:16:26 tv Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/14 22:13:40 tv Exp $
+HOSTPROGNAME= nbcrunchgen
HOST_SRCDIR= usr.bin/crunch/crunchgen
.include "${.CURDIR}/../Makefile.host"
diff -r f5946690e994 -r 8445ae35196f tools/gencat/Makefile
--- a/tools/gencat/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/gencat/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/11/12 23:16:27 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/14 22:13:40 tv Exp $
+HOSTPROGNAME= nbgencat
HOST_SRCDIR= usr.bin/gencat
.include "${.CURDIR}/../Makefile.host"
diff -r f5946690e994 -r 8445ae35196f tools/groff/Makefile
--- a/tools/groff/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/groff/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/11/13 14:21:03 tv Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/14 22:13:40 tv Exp $
MODULE= groff
ALL_TARGET= src/include all
+MAKE_ARGS= bindir=${TOOLDIR}/lib/groff
# Add gnuwrap hack directly to the Makefile.
_NOWRAPPER=1
@@ -31,3 +32,9 @@
afterinstall: ${TMACDIR}/tmac.an
${TMACDIR}/tmac.an: ${TMACDIR}/tmac.andoc
${INSTALL_FILE:N-U} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}
+
+.for F in eqn groff indxbib pic refer soelim tbl
+afterinstall: ${TOOLDIR}/bin/nb${F}
+${TOOLDIR}/bin/nb${F}: ${TOOLDIR}/lib/groff/${F}
+ ln -f ${.ALLSRC} ${.TARGET}
+.endfor
diff -r f5946690e994 -r 8445ae35196f tools/lex/Makefile
--- a/tools/lex/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/lex/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/11/12 23:16:28 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/14 22:13:40 tv Exp $
+HOSTPROGNAME= nblex
HOST_SRCDIR= usr.bin/lex
.include "${.CURDIR}/../Makefile.host"
diff -r f5946690e994 -r 8445ae35196f tools/lorder/Makefile
--- a/tools/lorder/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/lorder/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/09/22 05:02:13 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/14 22:13:41 tv Exp $
-TIMESTAMP= ${TOOLDIR}/bin/lorder
+TIMESTAMP= ${TOOLDIR}/bin/nblorder
.PATH: ${.CURDIR}/../../usr.bin/lorder
@@ -8,6 +8,4 @@
install: ${TIMESTAMP}
${TIMESTAMP}: lorder.sh
-.if !make(build)
- ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${BINMODE} $> $@
-.endif
+ ${INSTALL_FILE:N-U} -m ${BINMODE} ${.ALLSRC} ${.TARGET}
diff -r f5946690e994 -r 8445ae35196f tools/m4/Makefile
--- a/tools/m4/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/m4/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2001/11/14 15:32:05 tv Exp $
+# $NetBSD: Makefile,v 1.2 2001/11/14 22:13:41 tv Exp $
+HOSTPROGNAME= nbm4
HOST_SRCDIR= usr.bin/m4
.include "${.CURDIR}/../Makefile.host"
diff -r f5946690e994 -r 8445ae35196f tools/menuc/Makefile
--- a/tools/menuc/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/menuc/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2001/11/12 23:16:31 tv Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/14 22:13:41 tv Exp $
-HOSTPROGNAME= menuc
+HOSTPROGNAME= nbmenuc
HOST_SRCDIR= usr.bin/menuc
HOSTFILES= menu_sys.def
HOST_FILESDIR= ${TOOLDIR}/share/misc
diff -r f5946690e994 -r 8445ae35196f tools/mkdep/Makefile
--- a/tools/mkdep/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/mkdep/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/11/12 23:16:31 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/14 22:13:41 tv Exp $
+HOSTPROGNAME= nbmkdep
HOST_SRCDIR= usr.bin/mkdep
.include "${.CURDIR}/../Makefile.host"
diff -r f5946690e994 -r 8445ae35196f tools/mklocale/Makefile
--- a/tools/mklocale/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/mklocale/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/11/12 23:16:33 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/14 22:13:41 tv Exp $
+HOSTPROGNAME= nbmklocale
HOST_SRCDIR= usr.bin/mklocale
.include "${.CURDIR}/../Makefile.host"
diff -r f5946690e994 -r 8445ae35196f tools/msgc/Makefile
--- a/tools/msgc/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/msgc/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2001/11/12 23:16:33 tv Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/14 22:13:42 tv Exp $
-HOSTPROGNAME= msgc
+HOSTPROGNAME= nbmsgc
HOST_SRCDIR= usr.bin/msgc
HOSTFILES= msg_sys.def
HOST_FILESDIR= ${TOOLDIR}/share/misc
diff -r f5946690e994 -r 8445ae35196f tools/mtree/Makefile
--- a/tools/mtree/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/mtree/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2001/11/12 23:16:33 tv Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/14 22:13:42 tv Exp $
+HOSTPROGNAME= nbmtree
HOST_SRCDIR= usr.sbin/mtree
HOST_CPPFLAGS= -DNO_MD5 -DNO_RMD160 -DNO_SHA1
diff -r f5946690e994 -r 8445ae35196f tools/rpcgen/Makefile
--- a/tools/rpcgen/Makefile Wed Nov 14 22:07:03 2001 +0000
+++ b/tools/rpcgen/Makefile Wed Nov 14 22:13:39 2001 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/11/12 23:16:34 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/14 22:13:42 tv Exp $
+HOSTPROGNAME= nbrpcgen
HOST_SRCDIR= usr.bin/rpcgen
.include "${.CURDIR}/../Makefile.host"
diff -r f5946690e994 -r 8445ae35196f tools/texinfo/Makefile
--- a/tools/texinfo/Makefile Wed Nov 14 22:07:03 2001 +0000
Home |
Main Index |
Thread Index |
Old Index