diff options
author | sjg <sjg@FreeBSD.org> | 2015-06-13 19:20:56 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2015-06-13 19:20:56 +0000 |
commit | 008d7c831feeec7a3430b92f009e28762c6740f1 (patch) | |
tree | 224d8be23eae518123c5b6db18c9819fe6ac6c62 /include | |
parent | 9c7d3132bfe16d56cf42cff4126ecc32c4dbc2a9 (diff) | |
parent | a4e18934b74c201653c0142376816d9d840a5ced (diff) | |
download | FreeBSD-src-008d7c831feeec7a3430b92f009e28762c6740f1.zip FreeBSD-src-008d7c831feeec7a3430b92f009e28762c6740f1.tar.gz |
Add META_MODE support.
Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.
Still need to add real targets under targets/ to build packages.
Differential Revision: D2796
Reviewed by: brooks imp
Diffstat (limited to 'include')
-rw-r--r-- | include/Makefile | 42 | ||||
-rw-r--r-- | include/Makefile.depend | 11 | ||||
-rw-r--r-- | include/arpa/Makefile | 2 | ||||
-rw-r--r-- | include/arpa/Makefile.depend | 11 | ||||
-rw-r--r-- | include/gssapi/Makefile.depend | 11 | ||||
-rw-r--r-- | include/protocols/Makefile.depend | 11 | ||||
-rw-r--r-- | include/rpc/Makefile.depend | 11 | ||||
-rw-r--r-- | include/rpcsvc/Makefile.depend | 11 | ||||
-rw-r--r-- | include/xlocale/Makefile.depend | 11 |
9 files changed, 118 insertions, 3 deletions
diff --git a/include/Makefile b/include/Makefile index d7badd7..ccdc8aa 100644 --- a/include/Makefile +++ b/include/Makefile @@ -128,8 +128,30 @@ _MARCHS= ${MACHINE_CPUARCH} _MARCHS+= x86 .endif +.if ${MK_STAGING} == "yes" +# tell bsd.incs.mk that we have it covered +NO_STAGE_INCLUDES= +.endif + .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 @@ -142,7 +164,10 @@ compat: .endfor mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \ -f ${.CURDIR}/../etc/mtree/BSD.include.dist \ - -p ${DESTDIR}${INCLUDEDIR} + -p ${DESTDIR}${INCLUDEDIR} > /dev/null +.if ${MK_META_MODE} == "yes" + touch ${.TARGET} +.endif copies: .for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \ @@ -229,6 +254,9 @@ copies: cd ${.CURDIR}/../sys/teken; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \ ${DESTDIR}${INCLUDEDIR}/teken +.if ${MK_META_MODE} == "yes" + touch ${.TARGET} +.endif symlinks: @${ECHO} "Setting up symlinks to kernel source tree..." @@ -343,3 +371,15 @@ symlinks: ln -fs ../../../sys/rpc/$$h \ ${DESTDIR}${INCLUDEDIR}/rpc; \ done +.if ${MK_META_MODE} == "yes" + touch ${.TARGET} +.endif + +.if ${MACHINE} == "host" +# we're here because we are building a sysroot... +# we need MACHINE et al set correctly +HOST_MACHINE!= uname -m +HOST_MACHINE_ARCH!= uname -p +MACHINE:= ${HOST_MACHINE} +MACHINE_ARCH:= ${HOST_MACHINE_ARCH} +.endif diff --git a/include/Makefile.depend b/include/Makefile.depend new file mode 100644 index 0000000..f80275d --- /dev/null +++ b/include/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/include/arpa/Makefile b/include/arpa/Makefile index 95fa1b3..77ac03c 100644 --- a/include/arpa/Makefile +++ b/include/arpa/Makefile @@ -3,9 +3,7 @@ .include <src.opts.mk> INCS= ftp.h inet.h nameser.h nameser_compat.h tftp.h -.if ${MK_TELNET} == "no" INCS+= telnet.h -.endif INCSDIR=${INCLUDEDIR}/arpa .include <bsd.prog.mk> diff --git a/include/arpa/Makefile.depend b/include/arpa/Makefile.depend new file mode 100644 index 0000000..f80275d --- /dev/null +++ b/include/arpa/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/include/gssapi/Makefile.depend b/include/gssapi/Makefile.depend new file mode 100644 index 0000000..f80275d --- /dev/null +++ b/include/gssapi/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/include/protocols/Makefile.depend b/include/protocols/Makefile.depend new file mode 100644 index 0000000..f80275d --- /dev/null +++ b/include/protocols/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/include/rpc/Makefile.depend b/include/rpc/Makefile.depend new file mode 100644 index 0000000..f80275d --- /dev/null +++ b/include/rpc/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/include/rpcsvc/Makefile.depend b/include/rpcsvc/Makefile.depend new file mode 100644 index 0000000..f80275d --- /dev/null +++ b/include/rpcsvc/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/include/xlocale/Makefile.depend b/include/xlocale/Makefile.depend new file mode 100644 index 0000000..f80275d --- /dev/null +++ b/include/xlocale/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif |