mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-22 02:37:15 +00:00
Convert include over to SRCTOP
Use SRCTOP in place of .CURDIR/.. as appropriate. The hand-crafted relative paths for the "links" option remain, though, since those are relative to /usr/include/sys/<blah> not to the source tree. Differential Revision: https://reviews.freebsd.org/D9932 Sponsored by: Netflix Silence On: arch@ (twice)
This commit is contained in:
Warner Losh
parent
6dcff5b77c
commit
28d60d6a80
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=315172
106
include/Makefile
106
include/Makefile
|
|
@ -29,7 +29,7 @@ INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
|
|||
uchar.h ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h \
|
||||
wchar.h wctype.h wordexp.h xlocale.h
|
||||
|
||||
.PATH: ${.CURDIR}/../contrib/libc-vis
|
||||
.PATH: ${SRCTOP}/contrib/libc-vis
|
||||
INCS+= vis.h
|
||||
|
||||
MHDRS= float.h floatingpoint.h stdarg.h
|
||||
|
|
@ -103,7 +103,7 @@ SHARED?= copies
|
|||
|
||||
INCS+= osreldate.h
|
||||
|
||||
SYSDIR= ${.CURDIR}/../sys
|
||||
SYSDIR= ${SRCTOP}/sys
|
||||
NEWVERS_SH= ${SYSDIR}/conf/newvers.sh
|
||||
PARAM_H= ${SYSDIR}/sys/param.h
|
||||
MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh
|
||||
|
|
@ -142,7 +142,7 @@ compat:
|
|||
fi
|
||||
.endfor
|
||||
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
|
||||
-f ${.CURDIR}/../etc/mtree/BSD.include.dist \
|
||||
-f ${SRCTOP}/etc/mtree/BSD.include.dist \
|
||||
-p ${DESTDIR}${INCLUDEDIR} > /dev/null
|
||||
|
||||
copies: .PHONY .META
|
||||
|
|
@ -156,101 +156,101 @@ copies: .PHONY .META
|
|||
fi
|
||||
.endfor
|
||||
.for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/evdev:Ndev/hyperv:Ndev/nand:Ndev/pci} ${LSUBSUBDIRS}
|
||||
cd ${.CURDIR}/../sys; \
|
||||
cd ${SRCTOP}/sys; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
|
||||
${DESTDIR}${INCLUDEDIR}/$i
|
||||
.endfor
|
||||
cd ${.CURDIR}/../sys/dev/acpica; \
|
||||
cd ${SRCTOP}/sys/dev/acpica; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 acpiio.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/acpica; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 acpi_hpet.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/acpica
|
||||
cd ${.CURDIR}/../sys/dev/agp; \
|
||||
cd ${SRCTOP}/sys/dev/agp; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 agpreg.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/agp
|
||||
cd ${.CURDIR}/../sys/dev/bktr; \
|
||||
cd ${SRCTOP}/sys/dev/bktr; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/bktr
|
||||
.if ${MK_NAND} != "no"
|
||||
cd ${.CURDIR}/../sys/dev/nand; \
|
||||
cd ${SRCTOP}/sys/dev/nand; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nandsim.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/nand; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nand_dev.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/nand
|
||||
.endif
|
||||
cd ${.CURDIR}/../sys/dev/evdev; \
|
||||
cd ${SRCTOP}/sys/dev/evdev; \
|
||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 input.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/evdev; \
|
||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 input-event-codes.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/evdev; \
|
||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 uinput.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/evdev
|
||||
cd ${.CURDIR}/../sys/dev/hyperv/include; \
|
||||
cd ${SRCTOP}/sys/dev/hyperv/include; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 hyperv.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/hyperv
|
||||
cd ${.CURDIR}/../sys/dev/hyperv/utilities; \
|
||||
cd ${SRCTOP}/sys/dev/hyperv/utilities; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 hv_snapshot.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/hyperv
|
||||
cd ${.CURDIR}/../sys/dev/pci; \
|
||||
cd ${SRCTOP}/sys/dev/pci; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 pcireg.h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/pci
|
||||
cd ${.CURDIR}/../sys/fs/cd9660/; \
|
||||
cd ${SRCTOP}/sys/fs/cd9660/; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${DESTDIR}${INCLUDEDIR}/isofs/cd9660
|
||||
.if ${MK_IPFILTER} != "no"
|
||||
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
|
||||
cd ${SRCTOP}/sys/contrib/ipfilter/netinet; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${DESTDIR}${INCLUDEDIR}/netinet
|
||||
.endif
|
||||
.if ${MK_PF} != "no"
|
||||
cd ${.CURDIR}/../sys/netpfil/pf; \
|
||||
cd ${SRCTOP}/sys/netpfil/pf; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${DESTDIR}${INCLUDEDIR}/netpfil/pf
|
||||
.endif
|
||||
cd ${.CURDIR}/../sys/crypto; \
|
||||
cd ${SRCTOP}/sys/crypto; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 rijndael/rijndael.h \
|
||||
${DESTDIR}${INCLUDEDIR}/crypto
|
||||
cd ${.CURDIR}/../sys/opencrypto; \
|
||||
cd ${SRCTOP}/sys/opencrypto; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${DESTDIR}${INCLUDEDIR}/crypto
|
||||
cd ${.CURDIR}/../sys/${MACHINE}/include; \
|
||||
cd ${SRCTOP}/sys/${MACHINE}/include; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${DESTDIR}${INCLUDEDIR}/machine
|
||||
.if exists(${.CURDIR}/../sys/${MACHINE}/include/pc)
|
||||
cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \
|
||||
.if exists(${SRCTOP}/sys/${MACHINE}/include/pc)
|
||||
cd ${SRCTOP}/sys/${MACHINE}/include/pc; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${DESTDIR}${INCLUDEDIR}/machine/pc
|
||||
.endif
|
||||
.for _MARCH in ${_MARCHS}
|
||||
.if exists(${.CURDIR}/../sys/${_MARCH}/include)
|
||||
.if exists(${SRCTOP}/sys/${_MARCH}/include)
|
||||
${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
|
||||
cd ${.CURDIR}/../sys/${_MARCH}/include; \
|
||||
cd ${SRCTOP}/sys/${_MARCH}/include; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${DESTDIR}${INCLUDEDIR}/${_MARCH}
|
||||
.if exists(${.CURDIR}/../sys/${_MARCH}/include/pc)
|
||||
.if exists(${SRCTOP}/sys/${_MARCH}/include/pc)
|
||||
${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
|
||||
cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \
|
||||
cd ${SRCTOP}/sys/${_MARCH}/include/pc; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
|
||||
${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc
|
||||
.endif
|
||||
.endif
|
||||
.endfor
|
||||
cd ${.CURDIR}/../sys/rpc; \
|
||||
cd ${SRCTOP}/sys/rpc; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 types.h \
|
||||
${DESTDIR}${INCLUDEDIR}/rpc
|
||||
cd ${.CURDIR}/../sys/teken; \
|
||||
cd ${SRCTOP}/sys/teken; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
|
||||
${DESTDIR}${INCLUDEDIR}/teken
|
||||
.if ${MK_CDDL} != "no"
|
||||
cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libzfs_core/common; \
|
||||
cd ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libzfs_core.h \
|
||||
${DESTDIR}${INCLUDEDIR}
|
||||
cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libnvpair; \
|
||||
cd ${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libnvpair.h \
|
||||
${DESTDIR}${INCLUDEDIR}
|
||||
cd ${.CURDIR}/../sys/cddl/contrib/opensolaris/uts/common/sys; \
|
||||
cd ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys; \
|
||||
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \
|
||||
${DESTDIR}${INCLUDEDIR}/sys
|
||||
.endif
|
||||
|
|
@ -258,114 +258,114 @@ copies: .PHONY .META
|
|||
symlinks: .PHONY .META
|
||||
@${ECHO} "Setting up symlinks to kernel source tree..."
|
||||
.for i in ${LDIRS}
|
||||
cd ${.CURDIR}/../sys/$i; \
|
||||
cd ${SRCTOP}/sys/$i; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
|
||||
done
|
||||
.endfor
|
||||
.for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/evdev:Ndev/hyperv:Ndev/nand:Ndev/pci}
|
||||
cd ${.CURDIR}/../sys/$i; \
|
||||
cd ${SRCTOP}/sys/$i; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
|
||||
done
|
||||
.endfor
|
||||
cd ${.CURDIR}/../sys/dev/acpica; \
|
||||
cd ${SRCTOP}/sys/dev/acpica; \
|
||||
for h in acpiio.h acpi_hpet.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/acpica/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/acpica; \
|
||||
done
|
||||
cd ${.CURDIR}/../sys/dev/agp; \
|
||||
cd ${SRCTOP}/sys/dev/agp; \
|
||||
for h in agpreg.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/agp/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/agp; \
|
||||
done
|
||||
cd ${.CURDIR}/../sys/dev/bktr; \
|
||||
cd ${SRCTOP}/sys/dev/bktr; \
|
||||
for h in ioctl_*.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/bktr/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/bktr; \
|
||||
done
|
||||
.if ${MK_NAND} != "no"
|
||||
cd ${.CURDIR}/../sys/dev/nand; \
|
||||
cd ${SRCTOP}/sys/dev/nand; \
|
||||
for h in nandsim.h nand_dev.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/nand/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/nand; \
|
||||
done
|
||||
.endif
|
||||
cd ${.CURDIR}/../sys/dev/evdev; \
|
||||
cd ${SRCTOP}/sys/dev/evdev; \
|
||||
for h in input.h input-event-codes.h uinput.h; do \
|
||||
ln -fs ../../../../sys/dev/evdev/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/evdev; \
|
||||
done
|
||||
cd ${.CURDIR}/../sys/dev/hyperv/include; \
|
||||
cd ${SRCTOP}/sys/dev/hyperv/include; \
|
||||
for h in hyperv.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/hyperv/include/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/hyperv; \
|
||||
done
|
||||
cd ${.CURDIR}/../sys/dev/hyperv/utilities; \
|
||||
cd ${SRCTOP}/sys/dev/hyperv/utilities; \
|
||||
for h in hv_snapshot.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/hyperv/utilities/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/hyperv; \
|
||||
done
|
||||
cd ${.CURDIR}/../sys/dev/pci; \
|
||||
cd ${SRCTOP}/sys/dev/pci; \
|
||||
for h in pcireg.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/pci/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/dev/pci; \
|
||||
done
|
||||
.for i in ${LSUBSUBDIRS}
|
||||
cd ${.CURDIR}/../sys/$i; \
|
||||
cd ${SRCTOP}/sys/$i; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
|
||||
done
|
||||
.endfor
|
||||
.if ${MK_IPFILTER} != "no"
|
||||
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
|
||||
cd ${SRCTOP}/sys/contrib/ipfilter/netinet; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/contrib/ipfilter/netinet/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/netinet; \
|
||||
done
|
||||
.endif
|
||||
.if ${MK_PF} != "no"
|
||||
cd ${.CURDIR}/../sys/netpfil/pf; \
|
||||
cd ${SRCTOP}/sys/netpfil/pf; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/netpfil/pf/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/netpfil/pf; \
|
||||
done
|
||||
.endif
|
||||
cd ${.CURDIR}/../sys/crypto; \
|
||||
cd ${SRCTOP}/sys/crypto; \
|
||||
for h in rijndael/rijndael.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/crypto/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/crypto; \
|
||||
done
|
||||
cd ${.CURDIR}/../sys/opencrypto; \
|
||||
cd ${SRCTOP}/sys/opencrypto; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/opencrypto/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/crypto; \
|
||||
done
|
||||
cd ${.CURDIR}/../sys/${MACHINE}/include; \
|
||||
cd ${SRCTOP}/sys/${MACHINE}/include; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/${MACHINE}/include/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/machine; \
|
||||
done
|
||||
.if exists(${.CURDIR}/../sys/${MACHINE}/include/pc)
|
||||
cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \
|
||||
.if exists(${SRCTOP}/sys/${MACHINE}/include/pc)
|
||||
cd ${SRCTOP}/sys/${MACHINE}/include/pc; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/${MACHINE}/include/pc/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/machine/pc; \
|
||||
done
|
||||
.endif
|
||||
.for _MARCH in ${_MARCHS}
|
||||
.if exists(${.CURDIR}/../sys/${_MARCH}/include)
|
||||
.if exists(${SRCTOP}/sys/${_MARCH}/include)
|
||||
${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
|
||||
cd ${.CURDIR}/../sys/${_MARCH}/include; \
|
||||
cd ${SRCTOP}/sys/${_MARCH}/include; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/${_MARCH}/include/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
|
||||
done
|
||||
.if exists(${.CURDIR}/../sys/${_MARCH}/include/pc)
|
||||
.if exists(${SRCTOP}/sys/${_MARCH}/include/pc)
|
||||
${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
|
||||
cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \
|
||||
cd ${SRCTOP}/sys/${_MARCH}/include/pc; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/${_MARCH}/include/pc/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
|
||||
|
|
@ -373,12 +373,12 @@ symlinks: .PHONY .META
|
|||
.endif
|
||||
.endif
|
||||
.endfor
|
||||
cd ${.CURDIR}/../sys/fs/cd9660; \
|
||||
cd ${SRCTOP}/sys/fs/cd9660; \
|
||||
for h in *.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/fs/cd9660/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/isofs/cd9660; \
|
||||
done
|
||||
cd ${.CURDIR}/../sys/rpc; \
|
||||
cd ${SRCTOP}/sys/rpc; \
|
||||
for h in types.h; do \
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/rpc/$$h \
|
||||
${DESTDIR}${INCLUDEDIR}/rpc; \
|
||||
|
|
|
|||
Loading…
Reference in a new issue