summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortb <tb@openbsd.org>2016-10-18 02:47:07 +0000
committertb <tb@openbsd.org>2016-10-18 02:47:07 +0000
commit57fb2d252f84dc39f9e832dab8451262ab7ef38e (patch)
tree500f95e2f72358882640b621af31333207257664
parentDelete remnants of "traptrace" support (diff)
downloadwireguard-openbsd-57fb2d252f84dc39f9e832dab8451262ab7ef38e.tar.xz
wireguard-openbsd-57fb2d252f84dc39f9e832dab8451262ab7ef38e.zip
Swap 'make cleandir' and 'make includes' for real.
Should have been part of commitid uHRFWpwUBjIz0UuR. Original message: Move libcrypto, librpcsvc and gnu/usr.bin/cc/include from RDIRS to PRDIRS, and add prereq targets, so some header files are generated by BUILDUSER during 'make prereq' instead of by root during 'make includes'. Switch the order of 'make cleandir' and 'make includes' during 'make build' so we don't generate many files twice. Except for some machine@ symlinks from ${MACHINE}/stand, /usr/obj is now clean from files generated by root during 'make build'. Those will be cleaned up in a second step. help, testing & ok deraadt, input from natano, further testing rpe
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 50cff4b6056..ef0041ec3b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.129 2016/10/06 18:56:17 natano Exp $
+# $OpenBSD: Makefile,v 1.130 2016/10/18 02:47:07 tb Exp $
#
# For more information on building in tricky environments, please see
@@ -79,8 +79,8 @@ build:
false; \
fi
cd ${.CURDIR}/share/mk && exec ${MAKE} install
- exec ${MAKE} includes
exec ${MAKE} cleandir
+ exec ${MAKE} includes
cd ${.CURDIR}/lib && \
su ${BUILDUSER} -c '${MAKE} depend && exec ${MAKE}' && \
NOMAN=1 exec ${MAKE} install