[src/trunk]: src/tools Make most things under src/tools use the TOOLDIR versi...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/070342e8e82c
branches:  trunk
changeset: 783045:070342e8e82c
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Dec 02 12:48:32 2012 +0000

description:
Make most things under src/tools use the TOOLDIR version of compat/defs.mk,
instead of the version in the .OBJDIR of tools/compat.

diffstat:

 tools/Makefile.host     |  6 +++---
 tools/genassym/Makefile |  6 ++----
 tools/groff/Makefile    |  7 +++----
 tools/libctf/Makefile   |  6 +++---
 tools/libdwarf/Makefile |  6 +++---
 tools/libelf/Makefile   |  6 +++---
 tools/lorder/Makefile   |  5 ++---
 7 files changed, 19 insertions(+), 23 deletions(-)

diffs (135 lines):

diff -r 1ef5823be282 -r 070342e8e82c tools/Makefile.host
--- a/tools/Makefile.host       Sun Dec 02 12:44:06 2012 +0000
+++ b/tools/Makefile.host       Sun Dec 02 12:48:32 2012 +0000
@@ -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 @@
 .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.
diff -r 1ef5823be282 -r 070342e8e82c tools/genassym/Makefile
--- a/tools/genassym/Makefile   Sun Dec 02 12:44:06 2012 +0000
+++ b/tools/genassym/Makefile   Sun Dec 02 12:48:32 2012 +0000
@@ -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
 
diff -r 1ef5823be282 -r 070342e8e82c tools/groff/Makefile
--- a/tools/groff/Makefile      Sun Dec 02 12:44:06 2012 +0000
+++ b/tools/groff/Makefile      Sun Dec 02 12:48:32 2012 +0000
@@ -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 @@
 
 
 .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"
diff -r 1ef5823be282 -r 070342e8e82c tools/libctf/Makefile
--- a/tools/libctf/Makefile     Sun Dec 02 12:44:06 2012 +0000
+++ b/tools/libctf/Makefile     Sun Dec 02 12:48:32 2012 +0000
@@ -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 @@
 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 \
diff -r 1ef5823be282 -r 070342e8e82c tools/libdwarf/Makefile
--- a/tools/libdwarf/Makefile   Sun Dec 02 12:44:06 2012 +0000
+++ b/tools/libdwarf/Makefile   Sun Dec 02 12:48:32 2012 +0000
@@ -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 @@
 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}
diff -r 1ef5823be282 -r 070342e8e82c tools/libelf/Makefile
--- a/tools/libelf/Makefile     Sun Dec 02 12:44:06 2012 +0000
+++ b/tools/libelf/Makefile     Sun Dec 02 12:48:32 2012 +0000
@@ -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+=     -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}
diff -r 1ef5823be282 -r 070342e8e82c tools/lorder/Makefile
--- a/tools/lorder/Makefile     Sun Dec 02 12:44:06 2012 +0000
+++ b/tools/lorder/Makefile     Sun Dec 02 12:48:32 2012 +0000
@@ -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