summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2015-04-16 20:22:40 +0000
committerglebius <glebius@FreeBSD.org>2015-04-16 20:22:40 +0000
commita29f5e7ca80965b7551a01382485f2e7cba838ec (patch)
treec8f5ed55ba8f99a6440ebcb37c38c74604cb8cc7 /include
parent6a373c232e9be2bf3c8f6ce3cb113bf7e749e9ff (diff)
downloadFreeBSD-src-a29f5e7ca80965b7551a01382485f2e7cba838ec.zip
FreeBSD-src-a29f5e7ca80965b7551a01382485f2e7cba838ec.tar.gz
Move ALTQ from contrib to net/altq. The ALTQ code is for many years
discontinued by its initial authors. In FreeBSD the code was already slightly edited during the pf(4) SMP project. It is about to be edited more in the projects/ifnet. Moving out of contrib also allows to remove several hacks to the make glue. Reviewed by: net@
Diffstat (limited to 'include')
-rw-r--r--include/Makefile11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/Makefile b/include/Makefile
index 46b24f5..d7badd7 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -50,6 +50,7 @@ LSUBDIRS= cam/ata cam/scsi \
geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
geom/mirror geom/mountver geom/multipath geom/nop \
geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \
+ net/altq \
netgraph/atm netgraph/netflow \
security/audit \
security/mac_biba security/mac_bsdextended security/mac_lomac \
@@ -144,7 +145,7 @@ compat:
-p ${DESTDIR}${INCLUDEDIR}
copies:
-.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \
+.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \
${_MARCHS}
.if exists(${DESTDIR}${INCLUDEDIR}/$i)
cd ${DESTDIR}${INCLUDEDIR}/$i; \
@@ -179,9 +180,6 @@ copies:
cd ${.CURDIR}/../sys/dev/pci; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 pcireg.h \
${DESTDIR}${INCLUDEDIR}/dev/pci
- cd ${.CURDIR}/../sys/contrib/altq/altq; \
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
- ${DESTDIR}${INCLUDEDIR}/altq
cd ${.CURDIR}/../sys/fs/cd9660/; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/isofs/cd9660
@@ -279,11 +277,6 @@ symlinks:
ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
done
.endfor
- cd ${.CURDIR}/../sys/contrib/altq/altq; \
- for h in *.h; do \
- ln -fs ../../../sys/contrib/altq/altq/$$h \
- ${DESTDIR}${INCLUDEDIR}/altq; \
- done
.if ${MK_IPFILTER} != "no"
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
for h in *.h; do \
OpenPOWER on IntegriCloud