Module Name: src
Committed By: riz
Date: Sat Jun 19 23:11:11 UTC 2010
Modified Files:
src/tools/ctfconvert: Makefile
src/tools/ctfmerge: Makefile
src/tools/disklabel: Makefile
src/tools/fdisk: Makefile
src/tools/installboot: Makefile
src/tools/libctf: Makefile
src/tools/libdwarf: Makefile
src/tools/libelf: Makefile
src/tools/mklocale: Makefile
src/tools/paxctl: Makefile
Added Files:
src/tools: Makefile.nbincludes
Removed Files:
src/tools: Makefile.disklabel
Log Message:
Rename Makefile.disklabel to Makefile.nbincludes, as this file has
been used by more than disklabel for years. New name suggestion from
mrg@ .
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r0 src/tools/Makefile.disklabel
cvs rdiff -u -r0 -r1.1 src/tools/Makefile.nbincludes
cvs rdiff -u -r1.1 -r1.2 src/tools/ctfconvert/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tools/ctfmerge/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/disklabel/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/fdisk/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tools/installboot/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tools/libctf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tools/libdwarf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/libelf/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tools/mklocale/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/paxctl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/ctfconvert/Makefile
diff -u src/tools/ctfconvert/Makefile:1.1 src/tools/ctfconvert/Makefile:1.2
--- src/tools/ctfconvert/Makefile:1.1 Wed Feb 24 21:34:57 2010
+++ src/tools/ctfconvert/Makefile Sat Jun 19 23:11:10 2010
@@ -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"
Index: src/tools/ctfmerge/Makefile
diff -u src/tools/ctfmerge/Makefile:1.1 src/tools/ctfmerge/Makefile:1.2
--- src/tools/ctfmerge/Makefile:1.1 Wed Feb 24 21:34:57 2010
+++ src/tools/ctfmerge/Makefile Sat Jun 19 23:11:10 2010
@@ -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"
Index: src/tools/disklabel/Makefile
diff -u src/tools/disklabel/Makefile:1.3 src/tools/disklabel/Makefile:1.4
--- src/tools/disklabel/Makefile:1.3 Tue Jan 5 15:45:26 2010
+++ src/tools/disklabel/Makefile Sat Jun 19 23:11:10 2010
@@ -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
Index: src/tools/fdisk/Makefile
diff -u src/tools/fdisk/Makefile:1.3 src/tools/fdisk/Makefile:1.4
--- src/tools/fdisk/Makefile:1.3 Sat Feb 14 13:56:41 2009
+++ src/tools/fdisk/Makefile Sat Jun 19 23:11:10 2010
@@ -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
Index: src/tools/installboot/Makefile
diff -u src/tools/installboot/Makefile:1.9 src/tools/installboot/Makefile:1.10
--- src/tools/installboot/Makefile:1.9 Sun Jun 12 20:24:14 2005
+++ src/tools/installboot/Makefile Sat Jun 19 23:11:10 2010
@@ -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"
Index: src/tools/libctf/Makefile
diff -u src/tools/libctf/Makefile:1.1 src/tools/libctf/Makefile:1.2
--- src/tools/libctf/Makefile:1.1 Wed Feb 24 21:34:57 2010
+++ src/tools/libctf/Makefile Sat Jun 19 23:11:10 2010
@@ -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>
Index: src/tools/libdwarf/Makefile
diff -u src/tools/libdwarf/Makefile:1.1 src/tools/libdwarf/Makefile:1.2
--- src/tools/libdwarf/Makefile:1.1 Wed Feb 24 21:34:57 2010
+++ src/tools/libdwarf/Makefile Sat Jun 19 23:11:10 2010
@@ -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>
Index: src/tools/libelf/Makefile
diff -u src/tools/libelf/Makefile:1.3 src/tools/libelf/Makefile:1.4
--- src/tools/libelf/Makefile:1.3 Tue Dec 29 17:32:18 2009
+++ src/tools/libelf/Makefile Sat Jun 19 23:11:10 2010
@@ -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
Index: src/tools/mklocale/Makefile
diff -u src/tools/mklocale/Makefile:1.5 src/tools/mklocale/Makefile:1.6
--- src/tools/mklocale/Makefile:1.5 Sat Jun 19 22:36:16 2010
+++ src/tools/mklocale/Makefile Sat Jun 19 23:11:10 2010
@@ -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"
Index: src/tools/paxctl/Makefile
diff -u src/tools/paxctl/Makefile:1.4 src/tools/paxctl/Makefile:1.5
--- src/tools/paxctl/Makefile:1.4 Tue Jan 30 23:47:37 2007
+++ src/tools/paxctl/Makefile Sat Jun 19 23:11:10 2010
@@ -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"
Added files:
Index: src/tools/Makefile.nbincludes
diff -u /dev/null src/tools/Makefile.nbincludes:1.1
--- /dev/null Sat Jun 19 23:11:11 2010
+++ src/tools/Makefile.nbincludes Sat Jun 19 23:11:10 2010
@@ -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
