Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make most things under src/tools use the TOOLDIR version of compat/defs.mk,

Browse Source 
instead of the version in the .OBJDIR of tools/compat.
This commit is contained in:
apb 2012-12-02 12:48:32 +00:00
parent a2542bc740
commit e0d2aa9d82
7 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/Makefile.host
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.host,v 1.28 2011/04/10 16:52:36 joerg Exp $
# $NetBSD: Makefile.host,v 1.29 2012/12/02 12:48:32 apb Exp $
NOINFO= # defined
NOLINT= # defined
@ -7,8 +7,8 @@ NOMAN= # defined
.include <bsd.own.mk>
.ifndef NOCOMPATLIB
COMPATOBJ!= cd ${.CURDIR}/../compat && ${PRINTOBJDIR}
.-include "${COMPATOBJ}/defs.mk"
# Use TOOLDIR copy of libnbcompat and associated *.h files
.-include "${TOOLDIR}/share/compat/defs.mk"
.endif
# Resolve pathnames in variables.

6
tools/genassym/Makefile
View File

@ -1,12 +1,10 @@
# $NetBSD: Makefile,v 1.5 2008/10/25 22:15:28 apb Exp $
# $NetBSD: Makefile,v 1.6 2012/12/02 12:48:32 apb Exp $
.include <bsd.own.mk>
.PATH.sh: ${.CURDIR}/../../usr.bin/genassym
COMPATOBJ!= cd ${.CURDIR}/../compat && ${PRINTOBJDIR}
.-include "${COMPATOBJ}/defs.mk"
.-include "${TOOLDIR}/share/compat/defs.mk"
TIMESTAMP= ${TOOLDIR}/bin/${_TOOL_PREFIX}genassym

7
tools/groff/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.29 2008/10/25 22:15:28 apb Exp $
# $NetBSD: Makefile,v 1.30 2012/12/02 12:48:32 apb Exp $
MODULE= groff
@ -29,10 +29,9 @@ _post_conf: .USE
.include "${.CURDIR}/../Makefile.gnuhost"
COMPATOBJ!= cd ${.CURDIR}/../compat && ${PRINTOBJDIR}
.-include "${COMPATOBJ}/defs.mk"
.-include "${TOOLDIR}/share/compat/defs.mk"
.PATH: ${.CURDIR}/../../share/tmac ${.CURDIR}/../../gnu/usr.bin/groff/tmac
.PATH: ${.CURDIR}/../../share/tmac ${.CURDIR}/../../gnu/usr.bin/groff/tmac
_installtmac: .USE
.if ${MKUPDATE} != "no"

6
tools/libctf/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2011/04/17 12:52:26 tron Exp $
# $NetBSD: Makefile,v 1.4 2012/12/02 12:48:32 apb Exp $
HOSTLIB= ctf
@ -23,8 +23,8 @@ LIBELF_DIR= ${.CURDIR}/../../external/bsd/libelf/dist
CPPFLAGS+= -DCTF_OLD_VERSIONS
.ifndef NOCOMPATLIB
COMPATOBJ!= cd ${.CURDIR}/../compat && ${PRINTOBJDIR}
CPPFLAGS+= -I${COMPATOBJ}
COMPATLIB_NO_LIB= yes # only the include files, not the library
.-include "${TOOLDIR}/share/compat/defs.mk"
.endif
CPPFLAGS+= -I${.CURDIR}/../compat \

6
tools/libdwarf/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2011/04/17 12:52:26 tron Exp $
# $NetBSD: Makefile,v 1.4 2012/12/02 12:48:32 apb Exp $
HOSTLIB=dwarf
@ -25,8 +25,8 @@ INCS= dwarf.h libdwarf.h
INCSDIR= /usr/include
.ifndef NOCOMPATLIB
COMPATOBJ!= cd ${.CURDIR}/../compat && ${PRINTOBJDIR}
CPPFLAGS+= -I${COMPATOBJ}
COMPATLIB_NO_LIB= yes # only the include files, not the library
.-include "${TOOLDIR}/share/compat/defs.mk"
.endif
CPPFLAGS+= -I${.CURDIR}/../compat -I${LIBDWARF_DIR} -I${LIBELF_DIR}

6
tools/libelf/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2011/04/17 12:52:26 tron Exp $
# $NetBSD: Makefile,v 1.6 2012/12/02 12:48:33 apb Exp $
HOSTLIB= elf
@ -67,8 +67,8 @@ CPPFLAGS+= -no-cpp-precomp
CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
.ifndef NOCOMPATLIB
COMPATOBJ!= cd ${.CURDIR}/../compat && ${PRINTOBJDIR}
CPPFLAGS+= -I${COMPATOBJ}
COMPATLIB_NO_LIB= yes # only the include files, not the library
.-include "${TOOLDIR}/share/compat/defs.mk"
.endif
.PATH: ${LIBELF_DIR}

5
tools/lorder/Makefile
View File

@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.11 2008/10/25 22:15:28 apb Exp $
# $NetBSD: Makefile,v 1.12 2012/12/02 12:48:33 apb Exp $
.include <bsd.own.mk>
COMPATOBJ!= cd ${.CURDIR}/../compat && ${PRINTOBJDIR}
.-include "${COMPATOBJ}/defs.mk"
.-include "${TOOLDIR}/share/compat/defs.mk"
TIMESTAMP= ${TOOLDIR}/bin/${_TOOL_PREFIX}lorder