summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-03-14 18:54:29 +0000
committergjb <gjb@FreeBSD.org>2016-03-14 18:54:29 +0000
commit086e6f562ffbb6de24f1e51c7df40f403dd1522b (patch)
tree7aa3dd8f24b6558f2ef57be4db6203ac91424ea3 /include
parent1c7e318a9a31cae130bd5b2de01d93e7800f66ff (diff)
parentaab6aadc586e30f7b3512d20c6a5f780bddc2de3 (diff)
downloadFreeBSD-src-086e6f562ffbb6de24f1e51c7df40f403dd1522b.zip
FreeBSD-src-086e6f562ffbb6de24f1e51c7df40f403dd1522b.tar.gz
MFH
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'include')
-rw-r--r--include/Makefile38
1 files changed, 5 insertions, 33 deletions
diff --git a/include/Makefile b/include/Makefile
index d8213ef..d014681 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -130,35 +130,16 @@ _MARCHS= ${MACHINE_CPUARCH}
_MARCHS+= x86
.endif
-.if ${MK_STAGING} == "yes"
-# tell bsd.incs.mk that we have it covered
-NO_STAGE_INCLUDES=
-.endif
+META_TARGETS+= compat copies symlinks
+stage_includes: ${SHARED}
.include <bsd.prog.mk>
-.if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD)
-.if make(all)
-DESTDIR= ${STAGE_OBJTOP}
-
-all: stage_include
-installincludes: buildincludes
-buildincludes: stage_prep
-
-stage_prep:
- @mkdir -p ${DESTDIR}${INCLUDEDIR}
- @touch $@
-
-stage_include: .dirdep installincludes
- @touch $@
-.endif
-.endif
-
installincludes: ${SHARED}
${SHARED}: compat
# Take care of stale directory-level symlinks.
-compat:
+compat: ${META_DEPS}
.for i in ${LDIRS} ${LSUBDIRS} machine ${_MARCHS} crypto
if [ -L ${DESTDIR}${INCLUDEDIR}/$i ]; then \
rm -f ${DESTDIR}${INCLUDEDIR}/$i; \
@@ -167,11 +148,8 @@ compat:
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
-f ${.CURDIR}/../etc/mtree/BSD.include.dist \
-p ${DESTDIR}${INCLUDEDIR} > /dev/null
-.if ${MK_DIRDEPS_BUILD} == "yes"
- @touch ${.TARGET}
-.endif
-copies:
+copies: ${META_DEPS}
.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \
${_MARCHS}
if [ -d ${DESTDIR}${INCLUDEDIR}/$i ]; then \
@@ -256,11 +234,8 @@ copies:
cd ${.CURDIR}/../sys/teken; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
${DESTDIR}${INCLUDEDIR}/teken
-.if ${MK_DIRDEPS_BUILD} == "yes"
- @touch ${.OBJDIR}/${.TARGET}
-.endif
-symlinks:
+symlinks: ${META_DEPS}
@${ECHO} "Setting up symlinks to kernel source tree..."
.for i in ${LDIRS}
cd ${.CURDIR}/../sys/$i; \
@@ -373,9 +348,6 @@ symlinks:
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/rpc/$$h \
${DESTDIR}${INCLUDEDIR}/rpc; \
done
-.if ${MK_DIRDEPS_BUILD} == "yes"
- @touch ${.OBJDIR}/${.TARGET}
-.endif
.if ${MACHINE} == "host" && !defined(_SKIP_BUILD)
# we're here because we are building a sysroot...
OpenPOWER on IntegriCloud