From 0293a237b08ee4da5eacd1c96495dc1b9831d520 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sun, 16 Oct 2016 19:28:44 +0000
Subject: 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
---
 src/lib/libcrypto/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index fb12a60279..173198dbab 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2016/09/23 21:49:30 natano Exp $
+# $OpenBSD: Makefile,v 1.8 2016/10/16 19:28:44 tb Exp $
 
 LIB=	crypto
 
@@ -373,7 +373,9 @@ HDRS_GEN=\
 	${.CURDIR}/arch/${MACHINE_CPU}/opensslconf.h \
 	${.OBJDIR}/obj_mac.h
 
-includes: obj_mac.h
+prereq: obj_mac.h
+
+includes: prereq
 	@test -d ${DESTDIR}/usr/include/openssl || \
 	    mkdir ${DESTDIR}/usr/include/openssl
 	@for i in $(HDRS); do \
-- 
cgit v1.2.3-55-g6feb