Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tools/compat Teach tools/compat/Makefile to use an uninstall...



details:   https://anonhg.NetBSD.org/src/rev/d324bc204da1
branches:  trunk
changeset: 783038:d324bc204da1
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Dec 02 12:19:34 2012 +0000

description:
Teach tools/compat/Makefile to use an uninstalled copy of host-mkdep
from the.OBJDIR of tools/host-mkdep.  This is in preparation for
building all three of tools/host-mkdep, tools/compat, and tools/binstall,
before installing any of them.

While here, also move the regen target to the end.

diffstat:

 tools/compat/Makefile |  19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r 4a657b4d76eb -r d324bc204da1 tools/compat/Makefile
--- a/tools/compat/Makefile     Sun Dec 02 12:18:16 2012 +0000
+++ b/tools/compat/Makefile     Sun Dec 02 12:19:34 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.59 2012/06/04 19:06:45 joerg Exp $
+#      $NetBSD: Makefile,v 1.60 2012/12/02 12:19:34 apb Exp $
 
 HOSTLIB=       nbcompat
 
@@ -72,12 +72,6 @@
 defs.mk: config.cache
        @touch ${.TARGET}
 
-# Run "${TOOLDIR}/bin/nbmake-${MACHINE} regen" by hand after editing
-# configure.ac.  See more detailed instructions in configure.ac.
-regen:
-       cd ${.CURDIR} && ${TOOLDIR}/bin/${_TOOL_PREFIX}autoconf
-       cd ${.CURDIR} && ${TOOLDIR}/bin/${_TOOL_PREFIX}autoheader
-
 include/.stamp:
        mkdir -p include/sys include/machine include/rpc include/arpa
        @touch ${.TARGET}
@@ -91,3 +85,14 @@
 CPPFLAGS:=     # empty
 
 .include <bsd.hostlib.mk>
+
+# Use uninstalled copy of host-mkdep
+HOST_MKDEP_OBJ!= cd ${.CURDIR}/../host-mkdep && ${PRINTOBJDIR}
+HOST_MKDEP=    ${HOST_MKDEP_OBJ}/host-mkdep
+MKDEP=         ${HOST_MKDEP}
+
+# Run "${TOOLDIR}/bin/nbmake-${MACHINE} regen" by hand after editing
+# configure.ac.  See more detailed instructions in configure.ac.
+regen:
+       cd ${.CURDIR} && ${TOOLDIR}/bin/${_TOOL_PREFIX}autoconf
+       cd ${.CURDIR} && ${TOOLDIR}/bin/${_TOOL_PREFIX}autoheader



Home | Main Index | Thread Index | Old Index