Module Name: src
Committed By: apb
Date: Sun Dec 2 12:19:34 UTC 2012
Modified Files:
src/tools/compat: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/tools/compat/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/compat/Makefile
diff -u src/tools/compat/Makefile:1.59 src/tools/compat/Makefile:1.60
--- src/tools/compat/Makefile:1.59 Mon Jun 4 19:06:45 2012
+++ src/tools/compat/Makefile Sun Dec 2 12:19:34 2012
@@ -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 @@ config.cache: include/.stamp configure n
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 @@ HOST_CPPFLAGS:= ${CPPFLAGS}
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
