Module Name: src
Committed By: apb
Date: Sun Dec 2 12:48:33 UTC 2012
Modified Files:
src/tools: Makefile.host
src/tools/genassym: Makefile
src/tools/groff: Makefile
src/tools/libctf: Makefile
src/tools/libdwarf: Makefile
src/tools/libelf: Makefile
src/tools/lorder: Makefile
Log Message:
Make most things under src/tools use the TOOLDIR version of cpma[t/defs.mk,
instead of the version in the .OBJDIR of tools/compat.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/tools/Makefile.host
cvs rdiff -u -r1.5 -r1.6 src/tools/genassym/Makefile
cvs rdiff -u -r1.29 -r1.30 src/tools/groff/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/libctf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/libdwarf/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tools/libelf/Makefile
cvs rdiff -u -r1.11 -r1.12 src/tools/lorder/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/Makefile.host
diff -u src/tools/Makefile.host:1.28 src/tools/Makefile.host:1.29
--- src/tools/Makefile.host:1.28 Sun Apr 10 16:52:36 2011
+++ src/tools/Makefile.host Sun Dec 2 12:48:32 2012
@@ -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.
Index: src/tools/genassym/Makefile
diff -u src/tools/genassym/Makefile:1.5 src/tools/genassym/Makefile:1.6
--- src/tools/genassym/Makefile:1.5 Sat Oct 25 22:15:28 2008
+++ src/tools/genassym/Makefile Sun Dec 2 12:48:32 2012
@@ -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
Index: src/tools/groff/Makefile
diff -u src/tools/groff/Makefile:1.29 src/tools/groff/Makefile:1.30
--- src/tools/groff/Makefile:1.29 Sat Oct 25 22:15:28 2008
+++ src/tools/groff/Makefile Sun Dec 2 12:48:32 2012
@@ -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"
Index: src/tools/libctf/Makefile
diff -u src/tools/libctf/Makefile:1.3 src/tools/libctf/Makefile:1.4
--- src/tools/libctf/Makefile:1.3 Sun Apr 17 12:52:26 2011
+++ src/tools/libctf/Makefile Sun Dec 2 12:48:32 2012
@@ -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/bs
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 \
Index: src/tools/libdwarf/Makefile
diff -u src/tools/libdwarf/Makefile:1.3 src/tools/libdwarf/Makefile:1.4
--- src/tools/libdwarf/Makefile:1.3 Sun Apr 17 12:52:26 2011
+++ src/tools/libdwarf/Makefile Sun Dec 2 12:48:32 2012
@@ -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}
Index: src/tools/libelf/Makefile
diff -u src/tools/libelf/Makefile:1.5 src/tools/libelf/Makefile:1.6
--- src/tools/libelf/Makefile:1.5 Sun Apr 17 12:52:26 2011
+++ src/tools/libelf/Makefile Sun Dec 2 12:48:33 2012
@@ -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}
Index: src/tools/lorder/Makefile
diff -u src/tools/lorder/Makefile:1.11 src/tools/lorder/Makefile:1.12
--- src/tools/lorder/Makefile:1.11 Sat Oct 25 22:15:28 2008
+++ src/tools/lorder/Makefile Sun Dec 2 12:48:33 2012
@@ -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
