summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2004-09-07 15:19:40 +0000
committerimp <imp@FreeBSD.org>2004-09-07 15:19:40 +0000
commite088e43c3d66cc11e7cc4c81ebd78d332a69179c (patch)
tree7187d2e674f83ddca79b6d7be9e407568f1b0f5c
parent9199fa2a941b36c54981e4554fe9b7a3d178073f (diff)
downloadFreeBSD-src-e088e43c3d66cc11e7cc4c81ebd78d332a69179c.zip
FreeBSD-src-e088e43c3d66cc11e7cc4c81ebd78d332a69179c.tar.gz
Although 'Unanimous Consent' appears to be a well defined and used in
the US Senate, Canadian Parliament and Australian Senate, it was causing some confusion. After some consultation with Mark Murray, change this to 'without objection' since often times a plain-speaking term is preferable to a regionally used term. Also, clarify that this procedure is to be used when for more mundane matters that need a sanity check, but don't need the whole, ponderous voting proceedure that more difficult issues require. Core members that read email in any given 48 hour period are trusted enough to know the difference and to provide the sanity check as necessary. Reviewed by: markm
-rw-r--r--Makefile.inc118
-rw-r--r--share/mk/bsd.subdir.mk4
2 files changed, 11 insertions, 11 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 6872b06..7730b7d 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -675,7 +675,7 @@ update:
#
legacy:
.for _tool in tools/build
- ${_+_}@${ECHODIR} "===> ${_tool}"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
@@ -750,7 +750,7 @@ bootstrap-tools:
${_crunchgen} \
${_gensnmptree} \
${_kbdcontrol}
- ${_+_}@${ECHODIR} "===> ${_tool}"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ depend; \
@@ -788,7 +788,7 @@ build-tools:
usr.bin/awk \
lib/libmagic \
usr.sbin/sysinstall
- ${_+_}@${ECHODIR} "===> ${_tool}"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ build-tools
@@ -796,7 +796,7 @@ build-tools:
.for _tool in \
gnu/usr.bin/cc/cc_tools \
${_kerberos5_tools}
- ${_+_}@${ECHODIR} "===> ${_tool}"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ depend; \
@@ -840,7 +840,7 @@ cross-tools:
${_crunchide} \
${_elf2exe} \
${_kgzip}
- ${_+_}@${ECHODIR} "===> ${_tool}"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ depend; \
@@ -933,7 +933,7 @@ _generic_libs+= usr.sbin/pcvt/keycap
.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
${_lib}__L: .PHONY
.if exists(${.CURDIR}/${_lib})
- ${_+_}@${ECHODIR} "===> ${_lib}"; \
+ ${_+_}@${ECHODIR} "===> ${_lib} (depend,all,install)"; \
cd ${.CURDIR}/${_lib}; \
${MAKE} DIRPRFX=${_lib}/ depend; \
${MAKE} DIRPRFX=${_lib}/ all; \
@@ -945,7 +945,7 @@ ${_lib}__L: .PHONY
# static PAM library, and dynamic PAM library before dynamic PAM
# modules.
lib/libpam__L: .PHONY
- ${_+_}@${ECHODIR} "===> lib/libpam"; \
+ ${_+_}@${ECHODIR} "===> lib/libpam (depend,all,install)"; \
cd ${.CURDIR}/lib/libpam; \
${MAKE} DIRPRFX=lib/libpam/ depend; \
${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
@@ -959,11 +959,11 @@ _generic_libs: ${_generic_libs:S/$/__L/}
.for entry in ${SUBDIR}
${entry}.${__target}__D: .PHONY
${_+_}@if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \
- ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH}"; \
+ ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \
edir=${entry}.${MACHINE_ARCH}; \
cd ${.CURDIR}/$${edir}; \
else \
- ${ECHODIR} "===> ${DIRPRFX}${entry}"; \
+ ${ECHODIR} "===> ${DIRPRFX}${entry} (${__target})"; \
edir=${entry}; \
cd ${.CURDIR}/$${edir}; \
fi; \
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 793272d..41c2f9c 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -44,11 +44,11 @@ _SUBDIR: .USE
.if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR)
@${_+_}for entry in ${SUBDIR}; do \
if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \
- ${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH}"; \
+ ${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH} (${.TARGET:realinstall=install})"; \
edir=$${entry}.${MACHINE_ARCH}; \
cd ${.CURDIR}/$${edir}; \
else \
- ${ECHODIR} "===> ${DIRPRFX}$$entry"; \
+ ${ECHODIR} "===> ${DIRPRFX}$$entry (${.TARGET:realinstall=install})"; \
edir=$${entry}; \
cd ${.CURDIR}/$${edir}; \
fi; \
OpenPOWER on IntegriCloud