diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/Makefile | 44 | ||||
-rw-r--r-- | include/Makefile.depend | 14 | ||||
-rw-r--r-- | include/arpa/Makefile | 7 | ||||
-rw-r--r-- | include/arpa/Makefile.depend | 12 | ||||
-rw-r--r-- | include/gssapi/Makefile | 1 | ||||
-rw-r--r-- | include/gssapi/Makefile.depend | 12 | ||||
-rwxr-xr-x | include/mk-osreldate.sh | 2 | ||||
-rw-r--r-- | include/protocols/Makefile | 1 | ||||
-rw-r--r-- | include/protocols/Makefile.depend | 12 | ||||
-rw-r--r-- | include/rpc/Makefile.depend | 12 | ||||
-rw-r--r-- | include/rpcsvc/Makefile.depend | 12 | ||||
-rw-r--r-- | include/xlocale/Makefile | 1 | ||||
-rw-r--r-- | include/xlocale/Makefile.depend | 12 |
13 files changed, 131 insertions, 11 deletions
diff --git a/include/Makefile b/include/Makefile index fe62e5e26d49..eb72491e2292 100644 --- a/include/Makefile +++ b/include/Makefile @@ -84,7 +84,7 @@ LSUBSUBDIRS+= netgraph/bluetooth/include .if ${MK_ICONV} == "yes" INCS+= iconv.h .endif - + # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is @@ -125,8 +125,30 @@ _MARCHS= ${MACHINE_CPUARCH} _MARCHS+= x86 .endif +.if ${MK_STAGING} != "no" +# 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 @@ -139,7 +161,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} altq 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..." @@ -348,3 +376,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 000000000000..482a633b8798 --- /dev/null +++ b/include/Makefile.depend @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + bin/cat.host \ + usr.bin/xinstall.host \ + + +.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 63ab7ea8e82c..2f1c2495ebe5 100644 --- a/include/arpa/Makefile +++ b/include/arpa/Makefile @@ -2,11 +2,8 @@ .include <src.opts.mk> -NO_OBJ= -INCS= ftp.h inet.h nameser.h nameser_compat.h tftp.h -.if ${MK_TELNET} == "no" -INCS+= telnet.h -.endif +INCS= ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h + INCSDIR=${INCLUDEDIR}/arpa .include <bsd.prog.mk> diff --git a/include/arpa/Makefile.depend b/include/arpa/Makefile.depend new file mode 100644 index 000000000000..57b7e10c3d71 --- /dev/null +++ b/include/arpa/Makefile.depend @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/include/gssapi/Makefile b/include/gssapi/Makefile index 8fb643fb3b56..b8b8ddea6166 100644 --- a/include/gssapi/Makefile +++ b/include/gssapi/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= INCS= gssapi.h INCSDIR= ${INCLUDEDIR}/gssapi diff --git a/include/gssapi/Makefile.depend b/include/gssapi/Makefile.depend new file mode 100644 index 000000000000..57b7e10c3d71 --- /dev/null +++ b/include/gssapi/Makefile.depend @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/include/mk-osreldate.sh b/include/mk-osreldate.sh index 239a66159b2a..ed8311c6ead8 100755 --- a/include/mk-osreldate.sh +++ b/include/mk-osreldate.sh @@ -49,4 +49,4 @@ $COPYRIGHT #endif EOF chmod 644 $tmpfile -mv $tmpfile osreldate.h +mv -f $tmpfile osreldate.h diff --git a/include/protocols/Makefile b/include/protocols/Makefile index ddd8f21dc912..a41f3540e2c1 100644 --- a/include/protocols/Makefile +++ b/include/protocols/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= INCS= dumprestore.h routed.h rwhod.h talkd.h timed.h INCSDIR=${INCLUDEDIR}/protocols diff --git a/include/protocols/Makefile.depend b/include/protocols/Makefile.depend new file mode 100644 index 000000000000..57b7e10c3d71 --- /dev/null +++ b/include/protocols/Makefile.depend @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +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 000000000000..57b7e10c3d71 --- /dev/null +++ b/include/rpc/Makefile.depend @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +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 000000000000..57b7e10c3d71 --- /dev/null +++ b/include/rpcsvc/Makefile.depend @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/include/xlocale/Makefile b/include/xlocale/Makefile index 7c20ea96a789..0ece6d297417 100644 --- a/include/xlocale/Makefile +++ b/include/xlocale/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= INCS= _ctype.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h\ _stdlib.h _string.h _strings.h _time.h _uchar.h _wchar.h INCSDIR=${INCLUDEDIR}/xlocale diff --git a/include/xlocale/Makefile.depend b/include/xlocale/Makefile.depend new file mode 100644 index 000000000000..57b7e10c3d71 --- /dev/null +++ b/include/xlocale/Makefile.depend @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif |