Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tools Rename Makefile.disklabel to Makefile.nbincludes, as t...
details: https://anonhg.NetBSD.org/src/rev/36cf7d150a38
branches: trunk
changeset: 755781:36cf7d150a38
user: riz <riz%NetBSD.org@localhost>
date: Sat Jun 19 23:11:10 2010 +0000
description:
Rename Makefile.disklabel to Makefile.nbincludes, as this file has
been used by more than disklabel for years. New name suggestion from
mrg@ .
diffstat:
tools/Makefile.disklabel | 52 ----------------------------------------------
tools/Makefile.nbincludes | 52 ++++++++++++++++++++++++++++++++++++++++++++++
tools/ctfconvert/Makefile | 4 +-
tools/ctfmerge/Makefile | 4 +-
tools/disklabel/Makefile | 4 +-
tools/fdisk/Makefile | 4 +-
tools/installboot/Makefile | 4 +-
tools/libctf/Makefile | 4 +-
tools/libdwarf/Makefile | 4 +-
tools/libelf/Makefile | 4 +-
tools/mklocale/Makefile | 4 +-
tools/paxctl/Makefile | 4 +-
12 files changed, 72 insertions(+), 72 deletions(-)
diffs (276 lines):
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/Makefile.disklabel
--- a/tools/Makefile.disklabel Sat Jun 19 22:41:32 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile.disklabel,v 1.15 2010/06/19 22:36:15 riz Exp $
-
-# NOxxx definitions are copied from Makefile.host, and are
-# required before .include <bsd.own.mk>. The include of bsd.own.mk
-# itself is required to get definitions of TOOL_* variables used in
-# "!=" variable assignments (which are performed early).
-#
-NOINFO= # defined
-NOLINT= # defined
-NOMAN= # defined
-
-.include <bsd.own.mk>
-
-_ARCHDIR= ${.CURDIR}/../../sys/arch
-_INCDIR= ${.CURDIR}/../../include
-_SYSDIR= ${.CURDIR}/../../sys/sys
-_UFSDIR= ${.CURDIR}/../../sys/ufs
-_SUBDIR!= cd ${_ARCHDIR} && ${MAKE} -V SUBDIR
-
-.if make(depend) || make(all) || make(dependall) || make(install)
-# There's no need to run these commands for "make cleandir" or "make obj",
-# and TOOL_SED will not yet have been built.
-_UFS_INCS!= cd ${_UFSDIR} && find ffs ufs -name '*.h'
-_ARCH_INCS!= ${TOOL_SED} -e 's/^\#.*//' ${.CURDIR}/../headerlist
-.endif
-
-_ARCH_INCS+= ews4800mips/include/pdinfo.h ews4800mips/include/vtoc.h
-
-_INCS= disktab.h
-_SYSINCS= bootblock.h \
- ctype_bits.h \
- disklabel.h disklabel_acorn.h disklabel_gpt.h disklabel_rdb.h \
- dkbad.h \
- exec_elf.h
-
-HOST_CPPFLAGS+= -I${TOOLDIR}/include
-
-beforedepend:
- ${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude
- ${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude/sys
- ${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude/ufs
- cd ${_ARCHDIR} && \
- ${TOOL_PAX} -s /include\\/// -rw ${_ARCH_INCS} \
- ${TOOLDIR}/include/nbinclude
- cd ${_INCDIR} && \
- ${TOOL_PAX} -rw ${_INCS} ${TOOLDIR}/include/nbinclude
- cd ${_SYSDIR} && \
- ${TOOL_PAX} -rw ${_SYSINCS} ${TOOLDIR}/include/nbinclude/sys
- cd ${_UFSDIR} && \
- ${TOOL_PAX} -rw ${_UFS_INCS} ${TOOLDIR}/include/nbinclude/ufs
- cd ${TOOLDIR}/include/nbinclude && rm -f machine && \
- ${HOST_INSTALL_SYMLINK} ${MACHINE} machine
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/Makefile.nbincludes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/Makefile.nbincludes Sat Jun 19 23:11:10 2010 +0000
@@ -0,0 +1,52 @@
+# $NetBSD: Makefile.nbincludes,v 1.1 2010/06/19 23:11:10 riz Exp $
+
+# NOxxx definitions are copied from Makefile.host, and are
+# required before .include <bsd.own.mk>. The include of bsd.own.mk
+# itself is required to get definitions of TOOL_* variables used in
+# "!=" variable assignments (which are performed early).
+#
+NOINFO= # defined
+NOLINT= # defined
+NOMAN= # defined
+
+.include <bsd.own.mk>
+
+_ARCHDIR= ${.CURDIR}/../../sys/arch
+_INCDIR= ${.CURDIR}/../../include
+_SYSDIR= ${.CURDIR}/../../sys/sys
+_UFSDIR= ${.CURDIR}/../../sys/ufs
+_SUBDIR!= cd ${_ARCHDIR} && ${MAKE} -V SUBDIR
+
+.if make(depend) || make(all) || make(dependall) || make(install)
+# There's no need to run these commands for "make cleandir" or "make obj",
+# and TOOL_SED will not yet have been built.
+_UFS_INCS!= cd ${_UFSDIR} && find ffs ufs -name '*.h'
+_ARCH_INCS!= ${TOOL_SED} -e 's/^\#.*//' ${.CURDIR}/../headerlist
+.endif
+
+_ARCH_INCS+= ews4800mips/include/pdinfo.h ews4800mips/include/vtoc.h
+
+_INCS= disktab.h
+_SYSINCS= bootblock.h \
+ ctype_bits.h \
+ disklabel.h disklabel_acorn.h disklabel_gpt.h disklabel_rdb.h \
+ dkbad.h \
+ exec_elf.h
+
+HOST_CPPFLAGS+= -I${TOOLDIR}/include
+
+beforedepend:
+ ${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude
+ ${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude/sys
+ ${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude/ufs
+ cd ${_ARCHDIR} && \
+ ${TOOL_PAX} -s /include\\/// -rw ${_ARCH_INCS} \
+ ${TOOLDIR}/include/nbinclude
+ cd ${_INCDIR} && \
+ ${TOOL_PAX} -rw ${_INCS} ${TOOLDIR}/include/nbinclude
+ cd ${_SYSDIR} && \
+ ${TOOL_PAX} -rw ${_SYSINCS} ${TOOLDIR}/include/nbinclude/sys
+ cd ${_UFSDIR} && \
+ ${TOOL_PAX} -rw ${_UFS_INCS} ${TOOLDIR}/include/nbinclude/ufs
+ cd ${TOOLDIR}/include/nbinclude && rm -f machine && \
+ ${HOST_INSTALL_SYMLINK} ${MACHINE} machine
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/ctfconvert/Makefile
--- a/tools/ctfconvert/Makefile Sat Jun 19 22:41:32 2010 +0000
+++ b/tools/ctfconvert/Makefile Sat Jun 19 23:11:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/02/24 21:34:57 darran Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/19 23:11:10 riz Exp $
.include <bsd.own.mk>
@@ -53,5 +53,5 @@
.PATH: ${OPENSOLARIS_DISTDIR}/tools/ctf/common
.PATH: ${OPENSOLARIS_DISTDIR}/tools/ctf/cvt
-.include "${.CURDIR}/../Makefile.disklabel"
+.include "${.CURDIR}/../Makefile.nbincludes"
.include "${.CURDIR}/../Makefile.host"
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/ctfmerge/Makefile
--- a/tools/ctfmerge/Makefile Sat Jun 19 22:41:32 2010 +0000
+++ b/tools/ctfmerge/Makefile Sat Jun 19 23:11:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/02/24 21:34:57 darran Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/19 23:11:10 riz Exp $
.include <bsd.own.mk>
@@ -36,5 +36,5 @@
.PATH: ${OPENSOLARIS_DISTDIR}/tools/ctf/common
.PATH: ${OPENSOLARIS_DISTDIR}/tools/ctf/cvt
-.include "${.CURDIR}/../Makefile.disklabel"
+.include "${.CURDIR}/../Makefile.nbincludes"
.include "${.CURDIR}/../Makefile.host"
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/disklabel/Makefile
--- a/tools/disklabel/Makefile Sat Jun 19 22:41:32 2010 +0000
+++ b/tools/disklabel/Makefile Sat Jun 19 23:11:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/01/05 15:45:26 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/19 23:11:10 riz Exp $
HOSTPROGNAME= nbdisklabel-${MAKEWRAPPERMACHINE}
HOST_SRCDIR= sbin/disklabel
@@ -14,7 +14,7 @@
CPPFLAGS+= -DTARGET_BYTE_ORDER=BIG_ENDIAN
.endif
-.include "${.CURDIR}/../Makefile.disklabel"
+.include "${.CURDIR}/../Makefile.nbincludes"
.include "${.CURDIR}/../Makefile.host"
.PATH: ${.CURDIR}/../../lib/libc/gen
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/fdisk/Makefile
--- a/tools/fdisk/Makefile Sat Jun 19 22:41:32 2010 +0000
+++ b/tools/fdisk/Makefile Sat Jun 19 23:11:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/14 13:56:41 abs Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/19 23:11:10 riz Exp $
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-fdisk
HOST_SRCDIR= sbin/fdisk
@@ -8,7 +8,7 @@
CPPFLAGS+= -DBOOTSEL
.endif
-.include "${.CURDIR}/../Makefile.disklabel"
+.include "${.CURDIR}/../Makefile.nbincludes"
.include "${.CURDIR}/../Makefile.host"
.PATH: ${.CURDIR}/../../lib/libc/gen
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/installboot/Makefile
--- a/tools/installboot/Makefile Sat Jun 19 22:41:32 2010 +0000
+++ b/tools/installboot/Makefile Sat Jun 19 23:11:10 2010 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2005/06/12 20:24:14 dyoung Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/19 23:11:10 riz Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}installboot
HOST_SRCDIR= usr.sbin/installboot
HOST_CPPFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../mips-elf2ecoff
-.include "${.CURDIR}/../Makefile.disklabel"
+.include "${.CURDIR}/../Makefile.nbincludes"
.include "${.CURDIR}/../Makefile.host"
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/libctf/Makefile
--- a/tools/libctf/Makefile Sat Jun 19 22:41:32 2010 +0000
+++ b/tools/libctf/Makefile Sat Jun 19 23:11:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/02/24 21:34:57 darran Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/19 23:11:10 riz Exp $
.include <bsd.own.mk>
@@ -61,5 +61,5 @@
mkdir -p ${TOOLDIR}/lib
${HOST_INSTALL_FILE} -m ${BINMODE} libctf.a ${.TARGET}
-.include "${.CURDIR}/../Makefile.disklabel"
+.include "${.CURDIR}/../Makefile.nbincludes"
.include <bsd.hostlib.mk>
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/libdwarf/Makefile
--- a/tools/libdwarf/Makefile Sat Jun 19 22:41:32 2010 +0000
+++ b/tools/libdwarf/Makefile Sat Jun 19 23:11:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/02/24 21:34:57 darran Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/19 23:11:10 riz Exp $
.include <bsd.own.mk>
@@ -48,5 +48,5 @@
HOST_CPPFLAGS:= ${CPPFLAGS}
CPPFLAGS:= # empty
-.include "${.CURDIR}/../Makefile.disklabel"
+.include "${.CURDIR}/../Makefile.nbincludes"
.include <bsd.hostlib.mk>
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/libelf/Makefile
--- a/tools/libelf/Makefile Sat Jun 19 22:41:32 2010 +0000
+++ b/tools/libelf/Makefile Sat Jun 19 23:11:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/12/29 17:32:18 thorpej Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/19 23:11:10 riz Exp $
.include <bsd.own.mk>
@@ -76,7 +76,7 @@
HOST_CPPFLAGS:= ${CPPFLAGS}
CPPFLAGS:= # empty
-.include "${.CURDIR}/../Makefile.disklabel"
+.include "${.CURDIR}/../Makefile.nbincludes"
.include <bsd.hostlib.mk>
# Keep the .SUFFIXES line after the include of bsd.hostlib.mk
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/mklocale/Makefile
--- a/tools/mklocale/Makefile Sat Jun 19 22:41:32 2010 +0000
+++ b/tools/mklocale/Makefile Sat Jun 19 23:11:10 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/06/19 22:36:16 riz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/19 23:11:10 riz Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}mklocale
HOST_SRCDIR= usr.bin/mklocale
HOST_CPPFLAGS+= -I${TOOLDIR}/include/nbinclude
-.include "${.CURDIR}/../Makefile.disklabel"
+.include "${.CURDIR}/../Makefile.nbincludes"
.include "${.CURDIR}/../Makefile.host"
diff -r a07cb8c6e1e8 -r 36cf7d150a38 tools/paxctl/Makefile
--- a/tools/paxctl/Makefile Sat Jun 19 22:41:32 2010 +0000
+++ b/tools/paxctl/Makefile Sat Jun 19 23:11:10 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/01/30 23:47:37 dogcow Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/19 23:11:10 riz Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}paxctl
HOST_SRCDIR= usr.sbin/paxctl
HOST_CPPFLAGS+= -I${TOOLDIR}/include/nbinclude
-.include "${.CURDIR}/../Makefile.disklabel"
+.include "${.CURDIR}/../Makefile.nbincludes"
.include "${.CURDIR}/../Makefile.host"
Home |
Main Index |
Thread Index |
Old Index