Author: ngie
Date: Wed Feb 4 11:43:19 2015
New Revision: 278202
URL: https://svnweb.freebsd.org/changeset/base/278202
Log:
Clean up more usb related files when MK_USB == no when dealing with
manpages, libraries, and binaries
MFC after: 1 week
X-MFC with: r278135
Sponsored by: EMC / Isilon Storage Division
Modified:
head/include/Makefile
head/share/examples/Makefile
head/share/man/man4/Makefile
head/share/man/man9/Makefile
head/share/misc/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
head/ (props changed)
head/include/ (props changed)
head/share/ (props changed)
head/share/man/man4/ (props changed)
Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile Wed Feb 4 11:25:34 2015 (r278201)
+++ head/include/Makefile Wed Feb 4 11:43:19 2015 (r278202)
@@ -44,7 +44,7 @@ LSUBDIRS= cam/ata cam/scsi \
dev/hwpmc \
dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/nvme \
dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \
- dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
+ dev/speaker dev/utopia dev/vkbd dev/wi \
fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \
fs/procfs fs/smbfs fs/udf fs/unionfs \
geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
@@ -56,6 +56,10 @@ LSUBDIRS= cam/ata cam/scsi \
security/mac_mls security/mac_partition \
ufs/ffs ufs/ufs
+.if ${MK_USB} != "no"
+LSUBDIRS+= dev/usb
+.endif
+
LSUBSUBDIRS= dev/mpt/mpilib
.if ${MK_CUSE} != "no"
Modified: head/share/examples/Makefile
==============================================================================
--- head/share/examples/Makefile Wed Feb 4 11:25:34 2015
(r278201)
+++ head/share/examples/Makefile Wed Feb 4 11:43:19 2015
(r278202)
@@ -18,7 +18,6 @@ LDIRS= BSD_daemon \
ipfw \
jails \
kld \
- libusb20 \
libvgl \
mdoc \
netgraph \
@@ -92,12 +91,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \
kld/syscall/module/syscall.c \
kld/syscall/test/Makefile \
kld/syscall/test/call.c \
- libusb20/Makefile \
- libusb20/README \
- libusb20/util.c \
- libusb20/util.h \
- libusb20/bulk.c \
- libusb20/control.c \
libvgl/Makefile \
libvgl/demo.c \
mdoc/POSIX-copyright \
@@ -203,6 +196,16 @@ XFILES+= hast/ucarp.sh \
hast/vip-up.sh
.endif
+.if ${MK_USB} != "no"
+LDIRS+= libusb20
+XFILES+= libusb20/Makefile \
+ libusb20/README \
+ libusb20/util.c \
+ libusb20/util.h \
+ libusb20/bulk.c \
+ libusb20/control.c
+.endif
+
.if ${MACHINE_CPUARCH} == "amd64"
.if ${MK_BHYVE} != "no"
LDIRS+= bhyve
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Wed Feb 4 11:25:34 2015
(r278201)
+++ head/share/man/man4/Makefile Wed Feb 4 11:43:19 2015
(r278202)
@@ -503,56 +503,6 @@ MAN= aac.4 \
tws.4 \
tx.4 \
txp.4 \
- u3g.4 \
- uark.4 \
- uart.4 \
- uath.4 \
- ubsa.4 \
- ubsec.4 \
- ubser.4 \
- ubtbcmfw.4 \
- uchcom.4 \
- ucom.4 \
- ucycom.4 \
- udav.4 \
- udbp.4 \
- udp.4 \
- udplite.4 \
- uep.4 \
- ufm.4 \
- ufoma.4 \
- uftdi.4 \
- ugen.4 \
- uhci.4 \
- uhid.4 \
- uhso.4 \
- uipaq.4 \
- ukbd.4 \
- uled.4 \
- ulpt.4 \
- umass.4 \
- umcs.4 \
- umct.4 \
- umodem.4 \
- umoscom.4 \
- ums.4 \
- unix.4 \
- upgt.4 \
- uplcom.4 \
- ural.4 \
- urio.4 \
- urndis.4 \
- ${_urtw.4} \
- urtwn.4 \
- urtwnfw.4 \
- usb.4 \
- usb_template.4 \
- usb_quirk.4 \
- uslcom.4 \
- usfs.4 \
- utopia.4 \
- uvisor.4 \
- uvscom.4 \
vale.4 \
vga.4 \
vge.4 \
@@ -735,13 +685,6 @@ MLINKS+=tl.4 if_tl.4
MLINKS+=tun.4 if_tun.4
MLINKS+=tx.4 if_tx.4
MLINKS+=txp.4 if_txp.4
-MLINKS+=u3g.4 u3gstub.4
-MLINKS+=uath.4 if_uath.4
-MLINKS+=udav.4 if_udav.4
-MLINKS+=upgt.4 if_upgt.4
-MLINKS+=ural.4 if_ural.4
-MLINKS+=urndis.4 if_urndis.4
-MLINKS+=${_urtw.4} ${_if_urtw.4}
MLINKS+=vge.4 if_vge.4
MLINKS+=vlan.4 if_vlan.4
MLINKS+=vxlan.4 if_vxlan.4
@@ -883,4 +826,66 @@ _pflog.4= pflog.4
_pfsync.4= pfsync.4
.endif
+.if ${MK_USB} != "no"
+MAN+= \
+ u3g.4 \
+ uark.4 \
+ uart.4 \
+ uath.4 \
+ ubsa.4 \
+ ubsec.4 \
+ ubser.4 \
+ ubtbcmfw.4 \
+ uchcom.4 \
+ ucom.4 \
+ ucycom.4 \
+ udav.4 \
+ udbp.4 \
+ udp.4 \
+ udplite.4 \
+ uep.4 \
+ ufm.4 \
+ ufoma.4 \
+ uftdi.4 \
+ ugen.4 \
+ uhci.4 \
+ uhid.4 \
+ uhso.4 \
+ uipaq.4 \
+ ukbd.4 \
+ uled.4 \
+ ulpt.4 \
+ umass.4 \
+ umcs.4 \
+ umct.4 \
+ umodem.4 \
+ umoscom.4 \
+ ums.4 \
+ unix.4 \
+ upgt.4 \
+ uplcom.4 \
+ ural.4 \
+ urio.4 \
+ urndis.4 \
+ ${_urtw.4} \
+ urtwn.4 \
+ urtwnfw.4 \
+ usb.4 \
+ usb_quirk.4 \
+ usb_template.4 \
+ usfs.4 \
+ uslcom.4 \
+ utopia.4 \
+ uvisor.4 \
+ uvscom.4 \
+
+MLINKS+=u3g.4 u3gstub.4
+MLINKS+=uath.4 if_uath.4
+MLINKS+=udav.4 if_udav.4
+MLINKS+=upgt.4 if_upgt.4
+MLINKS+=ural.4 if_ural.4
+MLINKS+=urndis.4 if_urndis.4
+MLINKS+=${_urtw.4} ${_if_urtw.4}
+.endif
+
.include <bsd.prog.mk>
Modified: head/share/man/man9/Makefile
==============================================================================
--- head/share/man/man9/Makefile Wed Feb 4 11:25:34 2015
(r278201)
+++ head/share/man/man9/Makefile Wed Feb 4 11:43:19 2015
(r278202)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.opts.mk>
+
MAN= accept_filter.9 \
accf_data.9 \
accf_dns.9 \
@@ -271,7 +273,6 @@ MAN= accept_filter.9 \
uidinfo.9 \
uio.9 \
unr.9 \
- usbdi.9 \
utopia.9 \
vaccess.9 \
vaccess_acl_nfs4.9 \
@@ -1593,6 +1594,9 @@ MLINKS+=uidinfo.9 uifind.9 \
uidinfo.9 uihold.9
MLINKS+=uio.9 uiomove.9 \
uio.9 uiomove_nofault.9
+
+.if ${MK_USB} != "no"
+MAN+= usbdi.9
MLINKS+=usbdi.9 usbd_do_request.9 \
usbdi.9 usbd_do_request_flags.9 \
usbdi.9 usbd_errstr.9 \
@@ -1644,6 +1648,7 @@ MLINKS+=usbdi.9 usbd_do_request.9 \
usbdi.9 usb_fifo_reset.9 \
usbdi.9 usb_fifo_softc.9 \
usbdi.9 usb_fifo_wakeup.9
+.endif
MLINKS+=vcount.9 count_dev.9
MLINKS+=vfsconf.9 vfs_modevent.9 \
vfsconf.9 vfs_register.9 \
Modified: head/share/misc/Makefile
==============================================================================
--- head/share/misc/Makefile Wed Feb 4 11:25:34 2015 (r278201)
+++ head/share/misc/Makefile Wed Feb 4 11:43:19 2015 (r278202)
@@ -1,15 +1,22 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$
+.include <src.opts.mk>
+
.PATH: ${.CURDIR}/../../sys/dev/usb
FILES= ascii birthtoken bsd-family-tree committers-doc.dot
committers-ports.dot \
committers-src.dot eqnchar flowers init.ee \
iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
- scsi_modes usb_hid_usages usbdevs \
+ scsi_modes \
organization.dot
NO_OBJ=
FILESDIR= ${BINDIR}/misc
+.if ${MK_USB} != "no"
+FILES+= usb_hid_usages
+FILES+= usbdevs
+.endif
+
.include <bsd.prog.mk>
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 11:25:34
2015 (r278201)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 11:43:19
2015 (r278202)
@@ -7366,6 +7366,13 @@ OLD_FILES+=usr/sbin/uathload
OLD_FILES+=usr/sbin/uhsoctl
OLD_FILES+=usr/sbin/usbconfig
OLD_FILES+=usr/sbin/usbdump
+OLD_FILES+=usr/share/examples/libusb20/Makefile
+OLD_FILES+=usr/share/examples/libusb20/README
+OLD_FILES+=usr/share/examples/libusb20/bulk.c
+OLD_FILES+=usr/share/examples/libusb20/control.c
+OLD_FILES+=usr/share/examples/libusb20/util.c
+OLD_FILES+=usr/share/examples/libusb20/util.h
+OLD_DIRS+=usr/share/examples/libusb20
OLD_FILES+=usr/share/man/man1/uhsoctl.1.gz
OLD_FILES+=usr/share/man/man1/usbhidaction.1.gz
OLD_FILES+=usr/share/man/man1/usbhidctl.1.gz
@@ -7568,9 +7575,114 @@ OLD_FILES+=usr/share/man/man3/usb_set_co
OLD_FILES+=usr/share/man/man3/usb_set_debug.3.gz
OLD_FILES+=usr/share/man/man3/usb_strerror.3.gz
OLD_FILES+=usr/share/man/man3/usbhid.3.gz
+OLD_FILES+=usr/share/man/man4/u3g.4.gz
+OLD_FILES+=usr/share/man/man4/u3gstub.4.gz
+OLD_FILES+=usr/share/man/man4/uark.4.gz
+OLD_FILES+=usr/share/man/man4/uart.4.gz
+OLD_FILES+=usr/share/man/man4/uath.4.gz
+OLD_FILES+=usr/share/man/man4/ubsa.4.gz
+OLD_FILES+=usr/share/man/man4/ubsec.4.gz
+OLD_FILES+=usr/share/man/man4/ubser.4.gz
+OLD_FILES+=usr/share/man/man4/ubtbcmfw.4.gz
+OLD_FILES+=usr/share/man/man4/uchcom.4.gz
+OLD_FILES+=usr/share/man/man4/ucom.4.gz
+OLD_FILES+=usr/share/man/man4/ucycom.4.gz
+OLD_FILES+=usr/share/man/man4/udav.4.gz
+OLD_FILES+=usr/share/man/man4/udbp.4.gz
+OLD_FILES+=usr/share/man/man4/udp.4.gz
+OLD_FILES+=usr/share/man/man4/udplite.4.gz
+OLD_FILES+=usr/share/man/man4/uep.4.gz
+OLD_FILES+=usr/share/man/man4/ufm.4.gz
+OLD_FILES+=usr/share/man/man4/ufoma.4.gz
+OLD_FILES+=usr/share/man/man4/uftdi.4.gz
+OLD_FILES+=usr/share/man/man4/ugen.4.gz
+OLD_FILES+=usr/share/man/man4/uhci.4.gz
+OLD_FILES+=usr/share/man/man4/uhid.4.gz
+OLD_FILES+=usr/share/man/man4/uhso.4.gz
+OLD_FILES+=usr/share/man/man4/uipaq.4.gz
+OLD_FILES+=usr/share/man/man4/ukbd.4.gz
+OLD_FILES+=usr/share/man/man4/uled.4.gz
+OLD_FILES+=usr/share/man/man4/ulpt.4.gz
+OLD_FILES+=usr/share/man/man4/umass.4.gz
+OLD_FILES+=usr/share/man/man4/umcs.4.gz
+OLD_FILES+=usr/share/man/man4/umct.4.gz
+OLD_FILES+=usr/share/man/man4/umodem.4.gz
+OLD_FILES+=usr/share/man/man4/umoscom.4.gz
+OLD_FILES+=usr/share/man/man4/ums.4.gz
+OLD_FILES+=usr/share/man/man4/unix.4.gz
+OLD_FILES+=usr/share/man/man4/upgt.4.gz
+OLD_FILES+=usr/share/man/man4/uplcom.4.gz
+OLD_FILES+=usr/share/man/man4/ural.4.gz
+OLD_FILES+=usr/share/man/man4/urio.4.gz
+OLD_FILES+=usr/share/man/man4/urndis.4.gz
+OLD_FILES+=usr/share/man/man4/urtw.4.gz
+OLD_FILES+=usr/share/man/man4/urtwn.4.gz
+OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz
+OLD_FILES+=usr/share/man/man4/usb.4.gz
+OLD_FILES+=usr/share/man/man4/usb_quirk.4.gz
+OLD_FILES+=usr/share/man/man4/usb_template.4.gz
+OLD_FILES+=usr/share/man/man4/usfs.4.gz
+OLD_FILES+=usr/share/man/man4/uslcom.4.gz
+OLD_FILES+=usr/share/man/man4/utopia.4.gz
+OLD_FILES+=usr/share/man/man4/uvisor.4.gz
+OLD_FILES+=usr/share/man/man4/uvscom.4.gz
OLD_FILES+=usr/share/man/man8/uathload.8.gz
OLD_FILES+=usr/share/man/man8/usbconfig.8.gz
OLD_FILES+=usr/share/man/man8/usbdump.8.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_alloc_buffer.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_attach.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_detach.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_free_buffer.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_get_data.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_buffer.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_error.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_linear.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_put_bytes_max.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_put_data.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_buffer.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_error.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_linear.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_reset.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_softc.9.gz
+OLD_FILES+=usr/share/man/man9/usb_fifo_wakeup.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_do_request.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_do_request_flags.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_errstr.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_info.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_uaa.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_transfer_clear_stall.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_transfer_drain.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_transfer_pending.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_transfer_poll.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_transfer_setup.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_transfer_start.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_transfer_stop.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_transfer_submit.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_transfer_unsetup.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_clr_flag.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_data.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_len.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_get_frame.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_get_priv.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_is_stalled.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_max_framelen.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_max_frames.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_max_len.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_set_flag.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_data.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_len.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_offset.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frames.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_set_interval.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_set_priv.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_set_stall.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_set_timeout.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_softc.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_state.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_xfer_status.9.gz
+OLD_FILES+=usr/share/man/man9/usbdi.9.gz
+OLD_FILES+=usr/share/misc/usb_hid_usages
+OLD_FILES+=usr/share/misc/usbdevs
.endif
.if ${MK_UTMPX} == no
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
