From 0ffa96a296bcf3e38b9a03a409a10889186072ae Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 4 Jan 2019 21:38:57 +0100 Subject: [PATCH] kernel: Remove unused *.h files from SRCS in kernel module Makefiles. They were found by checking the preprocessed code of the files in SRCS to see if the header was included at some point. After removal, the preprocessed source of a build with the old Makefiles was compared against one with the changes (for various kernel configurations and when building just from /usr/src) to verify that the commit leads to no functional change. --- sys/bus/firewire/Makefile | 8 +++----- sys/bus/iicbus/iicbus/Makefile | 2 +- sys/bus/pccard/Makefile | 9 +++------ sys/bus/smbus/ichsmb/Makefile | 4 ++-- sys/bus/smbus/smbus/Makefile | 2 +- sys/bus/u4b/audio/Makefile | 4 ++-- sys/bus/u4b/input/uep/Makefile | 2 +- sys/bus/u4b/input/uhid/Makefile | 2 +- sys/bus/u4b/input/ukbd/Makefile | 4 ++-- sys/bus/u4b/input/ums/Makefile | 2 +- sys/bus/u4b/misc/ufm/Makefile | 2 +- sys/bus/u4b/net/aue/Makefile | 2 +- sys/bus/u4b/net/axe/Makefile | 2 +- sys/bus/u4b/net/axge/Makefile | 4 ++-- sys/bus/u4b/net/cdce/Makefile | 2 +- sys/bus/u4b/net/cue/Makefile | 2 +- sys/bus/u4b/net/ipheth/Makefile | 2 +- sys/bus/u4b/net/kue/Makefile | 2 +- sys/bus/u4b/net/mos/Makefile | 2 +- sys/bus/u4b/net/udav/Makefile | 2 +- sys/bus/u4b/net/uether/Makefile | 2 +- sys/bus/u4b/net/urndis/Makefile | 2 +- sys/bus/u4b/quirk/Makefile | 2 +- sys/bus/u4b/serial/u3g/Makefile | 2 +- sys/bus/u4b/serial/uark/Makefile | 2 +- sys/bus/u4b/serial/ubsa/Makefile | 2 +- sys/bus/u4b/serial/ubser/Makefile | 2 +- sys/bus/u4b/serial/uchcom/Makefile | 2 +- sys/bus/u4b/serial/ucom/Makefile | 2 +- sys/bus/u4b/serial/ucycom/Makefile | 2 +- sys/bus/u4b/serial/ufoma/Makefile | 2 +- sys/bus/u4b/serial/uftdi/Makefile | 2 +- sys/bus/u4b/serial/ugensa/Makefile | 2 +- sys/bus/u4b/serial/uipaq/Makefile | 2 +- sys/bus/u4b/serial/ulpt/Makefile | 2 +- sys/bus/u4b/serial/umcs/Makefile | 2 +- sys/bus/u4b/serial/umct/Makefile | 2 +- sys/bus/u4b/serial/umodem/Makefile | 2 +- sys/bus/u4b/serial/umoscom/Makefile | 2 +- sys/bus/u4b/serial/uplcom/Makefile | 2 +- sys/bus/u4b/serial/uslcom/Makefile | 2 +- sys/bus/u4b/serial/uvisor/Makefile | 2 +- sys/bus/u4b/serial/uvscom/Makefile | 2 +- sys/bus/u4b/storage/umass/Makefile | 4 ++-- sys/bus/u4b/storage/urio/Makefile | 2 +- sys/bus/u4b/storage/usfs/Makefile | 2 +- sys/bus/u4b/usb/Makefile | 2 +- sys/bus/u4b/wlan/rum/Makefile | 2 +- sys/bus/u4b/wlan/run/Makefile | 2 +- sys/bus/u4b/wlan/urtwn/Makefile | 4 ++-- sys/crypto/Makefile | 2 +- sys/dev/disk/ahci/Makefile | 2 +- sys/dev/disk/iscsi/initiator/Makefile | 1 - sys/dev/disk/nata/natacard/Makefile | 2 +- sys/dev/disk/nata/natadisk/Makefile | 2 +- sys/dev/disk/nata/natapicam/Makefile | 2 +- sys/dev/disk/nata/natapicd/Makefile | 2 +- sys/dev/disk/nata/natapifd/Makefile | 2 +- sys/dev/disk/nata/natapist/Makefile | 2 +- sys/dev/disk/sbp/Makefile | 7 ++----- sys/dev/disk/sdhci/sdhci/Makefile | 2 +- sys/dev/disk/sdhci/sdhci_acpi/Makefile | 2 +- sys/dev/disk/sdhci/sdhci_pci/Makefile | 2 +- sys/dev/disk/sili/Makefile | 2 +- sys/dev/disk/sym/Makefile | 2 +- sys/dev/disk/trm/Makefile | 3 +-- sys/dev/disk/vpo/Makefile | 2 +- sys/dev/drm/drm/Makefile | 2 +- sys/dev/drm/i915/Makefile | 2 +- sys/dev/drm/radeon/Makefile | 12 ------------ sys/dev/misc/dcons/dcons/Makefile | 3 +-- sys/dev/misc/dcons/dcons_crom/Makefile | 4 +--- sys/dev/misc/putter/Makefile | 2 +- sys/dev/netif/ath/ath_dfs/null/Makefile | 2 +- sys/dev/netif/ath/ath_rate/sample/Makefile | 2 +- sys/dev/netif/iwi/Makefile | 3 +-- sys/dev/netif/iwm/Makefile | 2 +- sys/dev/netif/lnc/Makefile | 2 +- sys/dev/netif/wpi/Makefile | 1 - sys/dev/netif/xe/Makefile | 3 +-- sys/dev/powermng/alpm/Makefile | 2 +- sys/dev/powermng/intpm/Makefile | 4 ++-- sys/dev/powermng/viapm/Makefile | 2 +- sys/dev/raid/aac/Makefile | 2 +- sys/dev/raid/amr/amr_cam/Makefile | 2 +- sys/dev/raid/arcmsr/Makefile | 2 +- sys/dev/raid/asr/Makefile | 2 +- sys/dev/raid/ciss/Makefile | 2 +- sys/dev/raid/hpt27xx/Makefile | 2 +- sys/dev/raid/hptiop/Makefile | 2 +- sys/dev/raid/hptmv/Makefile | 2 +- sys/dev/raid/hptrr/Makefile | 2 +- sys/dev/raid/iir/Makefile | 2 +- sys/dev/raid/ips/Makefile | 6 ++---- sys/dev/raid/mfi/Makefile | 2 +- sys/dev/raid/mfi/mfip/Makefile | 2 +- sys/dev/raid/mly/Makefile | 2 +- sys/dev/raid/mrsas/Makefile | 2 +- sys/dev/raid/twa/Makefile | 2 +- sys/dev/raid/tws/Makefile | 2 +- sys/dev/raid/vinum/Makefile | 9 ++++----- sys/dev/sound/driver/hda/Makefile | 4 ++-- sys/dev/sound/driver/hdspe/Makefile | 2 +- sys/dev/sound/driver/spicds/Makefile | 2 +- sys/dev/video/cxm/cxm/Makefile | 2 +- sys/dev/video/cxm/cxm_iic/Makefile | 2 +- sys/dev/video/vga/Makefile | 2 +- sys/dev/virtual/virtio/balloon/Makefile | 1 - sys/dev/virtual/virtio/block/Makefile | 1 - sys/dev/virtual/virtio/net/Makefile | 1 - sys/dev/virtual/virtio/random/Makefile | 1 - sys/dev/virtual/virtio/scsi/Makefile | 3 +-- sys/libiconv/Makefile | 1 - sys/net/gif/Makefile | 3 +-- sys/net/ipfw3/Makefile | 4 ++-- sys/net/ipfw3_basic/Makefile | 12 ++++++------ sys/net/netmap/Makefile | 6 +++--- sys/net/pf/Makefile | 2 +- sys/netbt/Makefile | 5 +---- sys/netproto/802_11/wlan/Makefile | 2 +- sys/vfs/puffs/Makefile | 4 ++-- sys/vfs/smbfs/Makefile | 4 +--- 122 files changed, 140 insertions(+), 183 deletions(-) diff --git a/sys/bus/firewire/Makefile b/sys/bus/firewire/Makefile index ab34ea6500..75a8393f02 100644 --- a/sys/bus/firewire/Makefile +++ b/sys/bus/firewire/Makefile @@ -1,14 +1,12 @@ # $FreeBSD: src/sys/modules/firewire/firewire/Makefile,v 1.2.2.5 2003/04/28 03:29:19 simokawa Exp $ -# $DragonFly: src/sys/bus/firewire/Makefile,v 1.3 2003/08/15 01:19:50 dillon Exp $ # Makefile for the IEEE1394 OHCI chipset KMOD= firewire SRCS = bus_if.h device_if.h pci_if.h \ - firewire.c firewire.h firewire_phy.h firewirereg.h \ - fwohci.c fwohci_pci.c fwohcireg.h fwohcivar.h \ - iec13213.h iec68113.h \ - fwcrom.c fwdev.c fwmem.c fwmem.h fwdma.c fwdma.h + firewire.c \ + fwohci.c fwohci_pci.c \ + fwcrom.c fwdev.c fwmem.c fwdma.c .include diff --git a/sys/bus/iicbus/iicbus/Makefile b/sys/bus/iicbus/iicbus/Makefile index 2d7f8b114b..5e89b55b1d 100644 --- a/sys/bus/iicbus/iicbus/Makefile +++ b/sys/bus/iicbus/iicbus/Makefile @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/.. KMOD = iicbus SRCS = device_if.h bus_if.h iicbus_if.h iicbus_if.c \ - iiconf.h iiconf.c iicbus.h iicbus.c + iiconf.c iicbus.c .include diff --git a/sys/bus/pccard/Makefile b/sys/bus/pccard/Makefile index e57b6e9e5a..499297218b 100644 --- a/sys/bus/pccard/Makefile +++ b/sys/bus/pccard/Makefile @@ -1,12 +1,9 @@ -# $DragonFly: src/sys/bus/pccard/Makefile,v 1.3 2007/07/05 12:08:53 sephe Exp $ -# # Makefile for the PCCARD subsystem KMOD= pccard -SRCS= bus_if.h device_if.h pci_if.h \ - pccard.c card_if.h power_if.h\ - pccard_cis.c pccard_cis_quirks.c pccarddevs.h \ - pccardreg.h pccardvar.h +SRCS= bus_if.h device_if.h \ + pccard.c card_if.h power_if.h \ + pccard_cis.c pccard_cis_quirks.c pccarddevs.h .include diff --git a/sys/bus/smbus/ichsmb/Makefile b/sys/bus/smbus/ichsmb/Makefile index 456442f0c2..5e20ff7444 100644 --- a/sys/bus/smbus/ichsmb/Makefile +++ b/sys/bus/smbus/ichsmb/Makefile @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/.. KMOD = ichsmb -SRCS = device_if.h bus_if.h iicbb_if.h pci_if.h smbus_if.h \ - ichsmb.c ichsmb_pci.c ichsmb_reg.h ichsmb_var.h +SRCS = device_if.h bus_if.h pci_if.h smbus_if.h \ + ichsmb.c ichsmb_pci.c .include diff --git a/sys/bus/smbus/smbus/Makefile b/sys/bus/smbus/smbus/Makefile index b0c831b506..84672c0f86 100644 --- a/sys/bus/smbus/smbus/Makefile +++ b/sys/bus/smbus/smbus/Makefile @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/.. KMOD = smbus SRCS = device_if.h bus_if.h smbus_if.h smbus_if.c \ - smbconf.h smbconf.c smbus.h smbus.c + smbconf.c smbus.c .include diff --git a/sys/bus/u4b/audio/Makefile b/sys/bus/u4b/audio/Makefile index 5100e29e83..5583c980b1 100644 --- a/sys/bus/u4b/audio/Makefile +++ b/sys/bus/u4b/audio/Makefile @@ -1,8 +1,8 @@ # $FreeBSD: head/sys/modules/sound/driver/uaudio/Makefile 266006 2014-05-14 07:33:06Z hselasky $ KMOD= uaudio -SRCS= bus_if.h device_if.h mixer_if.h usb_if.h -SRCS+= opt_usb.h opt_bus.h opt_snd.h feeder_if.h channel_if.h usbdevs.h +SRCS= bus_if.h device_if.h mixer_if.h +SRCS+= opt_usb.h opt_snd.h feeder_if.h channel_if.h usbdevs.h SRCS+= uaudio_pcm.c uaudio.c .include diff --git a/sys/bus/u4b/input/uep/Makefile b/sys/bus/u4b/input/uep/Makefile index e09df7eac9..a5d12c3316 100644 --- a/sys/bus/u4b/input/uep/Makefile +++ b/sys/bus/u4b/input/uep/Makefile @@ -2,7 +2,7 @@ KMOD= uep -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ uep.c .include diff --git a/sys/bus/u4b/input/uhid/Makefile b/sys/bus/u4b/input/uhid/Makefile index 20636795b8..7fbcadbf78 100644 --- a/sys/bus/u4b/input/uhid/Makefile +++ b/sys/bus/u4b/input/uhid/Makefile @@ -2,7 +2,7 @@ KMOD= uhid -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ uhid.c .include diff --git a/sys/bus/u4b/input/ukbd/Makefile b/sys/bus/u4b/input/ukbd/Makefile index b24ebcf88a..8a6f665b89 100644 --- a/sys/bus/u4b/input/ukbd/Makefile +++ b/sys/bus/u4b/input/ukbd/Makefile @@ -2,8 +2,8 @@ KMOD= ukbd -SRCS= bus_if.h device_if.h usb_if.h \ - opt_bus.h opt_evdev.h opt_kbd.h opt_ukbd.h opt_usb.h \ +SRCS= bus_if.h device_if.h \ + opt_evdev.h opt_kbd.h opt_ukbd.h opt_usb.h \ ukbd.c .include diff --git a/sys/bus/u4b/input/ums/Makefile b/sys/bus/u4b/input/ums/Makefile index 458ed68065..fe4e33636b 100644 --- a/sys/bus/u4b/input/ums/Makefile +++ b/sys/bus/u4b/input/ums/Makefile @@ -2,7 +2,7 @@ KMOD= ums -SRCS= opt_bus.h opt_evdev.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_evdev.h opt_usb.h device_if.h bus_if.h \ usbdevs.h ums.c .include diff --git a/sys/bus/u4b/misc/ufm/Makefile b/sys/bus/u4b/misc/ufm/Makefile index a4d24a9202..ab0e683ba3 100644 --- a/sys/bus/u4b/misc/ufm/Makefile +++ b/sys/bus/u4b/misc/ufm/Makefile @@ -28,6 +28,6 @@ .PATH: ${.CURDIR}/.. KMOD= ufm -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h ufm.c +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h ufm.c .include diff --git a/sys/bus/u4b/net/aue/Makefile b/sys/bus/u4b/net/aue/Makefile index 9f12fe8edf..f86f826c00 100644 --- a/sys/bus/u4b/net/aue/Makefile +++ b/sys/bus/u4b/net/aue/Makefile @@ -28,7 +28,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_aue -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ miibus_if.h opt_inet.h \ if_aue.c diff --git a/sys/bus/u4b/net/axe/Makefile b/sys/bus/u4b/net/axe/Makefile index 0099392fb6..78bc0753ea 100644 --- a/sys/bus/u4b/net/axe/Makefile +++ b/sys/bus/u4b/net/axe/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_axe -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ miibus_if.h opt_inet.h \ if_axe.c diff --git a/sys/bus/u4b/net/axge/Makefile b/sys/bus/u4b/net/axge/Makefile index 83c46ddf8b..1b8ed78e7f 100644 --- a/sys/bus/u4b/net/axge/Makefile +++ b/sys/bus/u4b/net/axge/Makefile @@ -4,7 +4,7 @@ KMOD= if_axge SRCS+= if_axge.c usbdevs.h -SRCS+= bus_if.h device_if.h miibus_if.h usb_if.h \ - opt_bus.h opt_inet.h opt_usb.h +SRCS+= bus_if.h device_if.h miibus_if.h \ + opt_inet.h opt_usb.h .include diff --git a/sys/bus/u4b/net/cdce/Makefile b/sys/bus/u4b/net/cdce/Makefile index 723885ca2b..ae319f5038 100644 --- a/sys/bus/u4b/net/cdce/Makefile +++ b/sys/bus/u4b/net/cdce/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_cdce -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ miibus_if.h opt_inet.h \ if_cdce.c diff --git a/sys/bus/u4b/net/cue/Makefile b/sys/bus/u4b/net/cue/Makefile index 2ea964133f..2f1921d3e8 100644 --- a/sys/bus/u4b/net/cue/Makefile +++ b/sys/bus/u4b/net/cue/Makefile @@ -28,7 +28,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_cue -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ miibus_if.h opt_inet.h \ if_cue.c diff --git a/sys/bus/u4b/net/ipheth/Makefile b/sys/bus/u4b/net/ipheth/Makefile index f6bfbac728..ed2ed9de61 100644 --- a/sys/bus/u4b/net/ipheth/Makefile +++ b/sys/bus/u4b/net/ipheth/Makefile @@ -28,7 +28,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_ipheth -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ miibus_if.h opt_inet.h \ if_ipheth.c diff --git a/sys/bus/u4b/net/kue/Makefile b/sys/bus/u4b/net/kue/Makefile index 6c43a81e44..b029cb743b 100644 --- a/sys/bus/u4b/net/kue/Makefile +++ b/sys/bus/u4b/net/kue/Makefile @@ -28,7 +28,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_kue -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ miibus_if.h opt_inet.h \ if_kue.c diff --git a/sys/bus/u4b/net/mos/Makefile b/sys/bus/u4b/net/mos/Makefile index f3f1d4971a..366e32cb2f 100644 --- a/sys/bus/u4b/net/mos/Makefile +++ b/sys/bus/u4b/net/mos/Makefile @@ -28,7 +28,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_mos -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ miibus_if.h opt_inet.h \ if_mos.c diff --git a/sys/bus/u4b/net/udav/Makefile b/sys/bus/u4b/net/udav/Makefile index 228c9c9f90..632c4ead2a 100644 --- a/sys/bus/u4b/net/udav/Makefile +++ b/sys/bus/u4b/net/udav/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_udav -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ miibus_if.h opt_inet.h \ if_udav.c diff --git a/sys/bus/u4b/net/uether/Makefile b/sys/bus/u4b/net/uether/Makefile index 2f20516f41..b4fff44030 100644 --- a/sys/bus/u4b/net/uether/Makefile +++ b/sys/bus/u4b/net/uether/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= uether -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ miibus_if.h opt_inet.h \ usb_ethernet.c diff --git a/sys/bus/u4b/net/urndis/Makefile b/sys/bus/u4b/net/urndis/Makefile index 3f442ca6c5..4dfbf86ecd 100644 --- a/sys/bus/u4b/net/urndis/Makefile +++ b/sys/bus/u4b/net/urndis/Makefile @@ -28,7 +28,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_urndis -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ miibus_if.h opt_inet.h \ if_urndis.c diff --git a/sys/bus/u4b/quirk/Makefile b/sys/bus/u4b/quirk/Makefile index 48a82821da..edda315e24 100644 --- a/sys/bus/u4b/quirk/Makefile +++ b/sys/bus/u4b/quirk/Makefile @@ -26,7 +26,7 @@ # KMOD= usb_quirk -SRCS= bus_if.h device_if.h usb_if.h opt_bus.h opt_usb.h usbdevs.h \ +SRCS= bus_if.h device_if.h opt_usb.h usbdevs.h \ usb_quirk.c .include diff --git a/sys/bus/u4b/serial/u3g/Makefile b/sys/bus/u4b/serial/u3g/Makefile index 7b17cffb2e..61167561ac 100644 --- a/sys/bus/u4b/serial/u3g/Makefile +++ b/sys/bus/u4b/serial/u3g/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= u3g -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ u3g.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/uark/Makefile b/sys/bus/u4b/serial/uark/Makefile index 9ca505e263..907a287525 100644 --- a/sys/bus/u4b/serial/uark/Makefile +++ b/sys/bus/u4b/serial/uark/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= uark -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ uark.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/ubsa/Makefile b/sys/bus/u4b/serial/ubsa/Makefile index 458dd82d5e..2ca3bad542 100644 --- a/sys/bus/u4b/serial/ubsa/Makefile +++ b/sys/bus/u4b/serial/ubsa/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= ubsa -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ ubsa.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/ubser/Makefile b/sys/bus/u4b/serial/ubser/Makefile index 67de53dfa5..7b3e951cea 100644 --- a/sys/bus/u4b/serial/ubser/Makefile +++ b/sys/bus/u4b/serial/ubser/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= ubser -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ ubser.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/uchcom/Makefile b/sys/bus/u4b/serial/uchcom/Makefile index 91f0432f45..403d4e41d4 100644 --- a/sys/bus/u4b/serial/uchcom/Makefile +++ b/sys/bus/u4b/serial/uchcom/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= uchcom -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ uchcom.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/ucom/Makefile b/sys/bus/u4b/serial/ucom/Makefile index 6eebb246ef..cfedf628e7 100644 --- a/sys/bus/u4b/serial/ucom/Makefile +++ b/sys/bus/u4b/serial/ucom/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= ucom -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ usb_serial.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/ucycom/Makefile b/sys/bus/u4b/serial/ucycom/Makefile index 671b07d9be..70a9b62689 100644 --- a/sys/bus/u4b/serial/ucycom/Makefile +++ b/sys/bus/u4b/serial/ucycom/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= ucycom -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ ucycom.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/ufoma/Makefile b/sys/bus/u4b/serial/ufoma/Makefile index 17e64e2e52..857efaf6dd 100644 --- a/sys/bus/u4b/serial/ufoma/Makefile +++ b/sys/bus/u4b/serial/ufoma/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= ufoma -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ ufoma.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/uftdi/Makefile b/sys/bus/u4b/serial/uftdi/Makefile index 758c7c9221..6e812d7121 100644 --- a/sys/bus/u4b/serial/uftdi/Makefile +++ b/sys/bus/u4b/serial/uftdi/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= uftdi -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ uftdi.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/ugensa/Makefile b/sys/bus/u4b/serial/ugensa/Makefile index f20e7b88e0..eb00369e9d 100644 --- a/sys/bus/u4b/serial/ugensa/Makefile +++ b/sys/bus/u4b/serial/ugensa/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= ugensa -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ ugensa.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/uipaq/Makefile b/sys/bus/u4b/serial/uipaq/Makefile index 7599018064..f865fb7e51 100644 --- a/sys/bus/u4b/serial/uipaq/Makefile +++ b/sys/bus/u4b/serial/uipaq/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= uipaq -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ uipaq.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/ulpt/Makefile b/sys/bus/u4b/serial/ulpt/Makefile index 02f4bd91c7..69d6597698 100644 --- a/sys/bus/u4b/serial/ulpt/Makefile +++ b/sys/bus/u4b/serial/ulpt/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= ulpt -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ ulpt.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/umcs/Makefile b/sys/bus/u4b/serial/umcs/Makefile index 8773eb8e69..e43278bbf7 100644 --- a/sys/bus/u4b/serial/umcs/Makefile +++ b/sys/bus/u4b/serial/umcs/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= umcs -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ umcs.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/umct/Makefile b/sys/bus/u4b/serial/umct/Makefile index cee8c9764b..39190b3640 100644 --- a/sys/bus/u4b/serial/umct/Makefile +++ b/sys/bus/u4b/serial/umct/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= umct -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ umct.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/umodem/Makefile b/sys/bus/u4b/serial/umodem/Makefile index 26ff9e69c0..4fa9fd1d50 100644 --- a/sys/bus/u4b/serial/umodem/Makefile +++ b/sys/bus/u4b/serial/umodem/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= umodem -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h usb_if.h \ umodem.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/umoscom/Makefile b/sys/bus/u4b/serial/umoscom/Makefile index 5f471799b7..9d6ff09472 100644 --- a/sys/bus/u4b/serial/umoscom/Makefile +++ b/sys/bus/u4b/serial/umoscom/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= umoscom -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ umoscom.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/uplcom/Makefile b/sys/bus/u4b/serial/uplcom/Makefile index dd058757c5..1b8aee580b 100644 --- a/sys/bus/u4b/serial/uplcom/Makefile +++ b/sys/bus/u4b/serial/uplcom/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= uplcom -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ uplcom.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/uslcom/Makefile b/sys/bus/u4b/serial/uslcom/Makefile index d9d0467de0..2bbdcd1991 100644 --- a/sys/bus/u4b/serial/uslcom/Makefile +++ b/sys/bus/u4b/serial/uslcom/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= uslcom -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ uslcom.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/uvisor/Makefile b/sys/bus/u4b/serial/uvisor/Makefile index 89dd1011ff..7ac34377d7 100644 --- a/sys/bus/u4b/serial/uvisor/Makefile +++ b/sys/bus/u4b/serial/uvisor/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= uvisor -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ uvisor.c usbdevs.h .include diff --git a/sys/bus/u4b/serial/uvscom/Makefile b/sys/bus/u4b/serial/uvscom/Makefile index 780ea5a4e4..a04e5a3290 100644 --- a/sys/bus/u4b/serial/uvscom/Makefile +++ b/sys/bus/u4b/serial/uvscom/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= uvscom -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h \ +SRCS= opt_usb.h device_if.h bus_if.h \ uvscom.c usbdevs.h .include diff --git a/sys/bus/u4b/storage/umass/Makefile b/sys/bus/u4b/storage/umass/Makefile index c32a4067fa..24c5e9e2b1 100644 --- a/sys/bus/u4b/storage/umass/Makefile +++ b/sys/bus/u4b/storage/umass/Makefile @@ -1,8 +1,8 @@ .PATH: ${.CURDIR}/.. KMOD= umass -SRCS= ata_if.h bus_if.h device_if.h usb_if.h usbdevs.h \ - opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h \ +SRCS= ata_if.h bus_if.h device_if.h usbdevs.h \ + opt_usb.h opt_cam.h \ umass.c .include diff --git a/sys/bus/u4b/storage/urio/Makefile b/sys/bus/u4b/storage/urio/Makefile index 5272766b7d..a7e40417b0 100644 --- a/sys/bus/u4b/storage/urio/Makefile +++ b/sys/bus/u4b/storage/urio/Makefile @@ -28,6 +28,6 @@ .PATH: ${.CURDIR}/.. KMOD= urio -SRCS= bus_if.h device_if.h opt_bus.h opt_usb.h usb_if.h usbdevs.h urio.c +SRCS= bus_if.h device_if.h opt_usb.h usbdevs.h urio.c .include diff --git a/sys/bus/u4b/storage/usfs/Makefile b/sys/bus/u4b/storage/usfs/Makefile index f42900556b..1e95bb112c 100644 --- a/sys/bus/u4b/storage/usfs/Makefile +++ b/sys/bus/u4b/storage/usfs/Makefile @@ -2,7 +2,7 @@ KMOD= usfs SRCS= ata_if.h bus_if.h device_if.h usb_if.h usbdevs.h \ - opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h \ + opt_usb.h \ ustorage_fs.c .include diff --git a/sys/bus/u4b/usb/Makefile b/sys/bus/u4b/usb/Makefile index 31a2055e2a..ccf8a32d62 100644 --- a/sys/bus/u4b/usb/Makefile +++ b/sys/bus/u4b/usb/Makefile @@ -5,7 +5,7 @@ KMOD= usb # XXX usb_compat_linux.c SRCS= bus_if.h device_if.h usb_if.h usb_if.c \ - opt_usb.h opt_bus.h opt_ddb.h \ + opt_usb.h opt_ddb.h \ usbdevs.h usbdevs_data.h \ usb_busdma.c usb_controller.c usb_core.c usb_debug.c \ usb_dev.c usb_device.c usb_dynamic.c usb_error.c usb_generic.c \ diff --git a/sys/bus/u4b/wlan/rum/Makefile b/sys/bus/u4b/wlan/rum/Makefile index 7e6011dff5..d5bbcff337 100644 --- a/sys/bus/u4b/wlan/rum/Makefile +++ b/sys/bus/u4b/wlan/rum/Makefile @@ -28,7 +28,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_rum -SRCS= opt_bus.h opt_inet.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ if_rum.c .if !defined(BUILDING_WITH_KERNEL) diff --git a/sys/bus/u4b/wlan/run/Makefile b/sys/bus/u4b/wlan/run/Makefile index 80bc8f3599..c19b0b3cb1 100644 --- a/sys/bus/u4b/wlan/run/Makefile +++ b/sys/bus/u4b/wlan/run/Makefile @@ -28,7 +28,7 @@ .PATH: ${.CURDIR}/.. KMOD= if_run -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_usb.h device_if.h bus_if.h usbdevs.h \ if_run.c .include diff --git a/sys/bus/u4b/wlan/urtwn/Makefile b/sys/bus/u4b/wlan/urtwn/Makefile index 1a75f6780f..b7094c354e 100644 --- a/sys/bus/u4b/wlan/urtwn/Makefile +++ b/sys/bus/u4b/wlan/urtwn/Makefile @@ -3,8 +3,8 @@ .PATH: ${.CURDIR}/.. KMOD = if_urtwn -SRCS = if_urtwn.c if_urtwnreg.h \ +SRCS = if_urtwn.c \ bus_if.h device_if.h \ - opt_bus.h opt_usb.h usb_if.h usbdevs.h opt_urtwn.h opt_wlan.h + opt_usb.h usbdevs.h opt_urtwn.h opt_wlan.h .include diff --git a/sys/crypto/Makefile b/sys/crypto/Makefile index beef8751e4..ac0893109c 100644 --- a/sys/crypto/Makefile +++ b/sys/crypto/Makefile @@ -17,7 +17,7 @@ SRCS += cast.c deflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c SRCS += skipjack.c bf_enc.c bf_skey.c SRCS += des_ecb.c des_enc.c des_setkey.c SRCS += sha1.c sha2.c -SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h +SRCS += cryptodev_if.h bus_if.h device_if.h SRCS += opt_ddb.h SRCS += camellia.c camellia-api.c SRCS += twofish.c diff --git a/sys/dev/disk/ahci/Makefile b/sys/dev/disk/ahci/Makefile index 82df933020..5d850d7c16 100644 --- a/sys/dev/disk/ahci/Makefile +++ b/sys/dev/disk/ahci/Makefile @@ -3,6 +3,6 @@ KMOD= ahci SRCS= ahci_dragonfly.c ahci_attach.c ahci_cam.c ahci_pm.c ahci.c \ - bus_if.h device_if.h pci_if.h opt_scsi.h opt_cam.h pcidevs.h + bus_if.h device_if.h pci_if.h opt_cam.h pcidevs.h .include diff --git a/sys/dev/disk/iscsi/initiator/Makefile b/sys/dev/disk/iscsi/initiator/Makefile index 043f96e9a9..a2d045adad 100644 --- a/sys/dev/disk/iscsi/initiator/Makefile +++ b/sys/dev/disk/iscsi/initiator/Makefile @@ -2,7 +2,6 @@ KMOD=iscsi_initiator -SRCS= iscsi.h iscsivar.h SRCS+= iscsi.c isc_cam.c isc_soc.c isc_sm.c isc_subr.c iscsi_subr.c SRCS+= opt_cam.h opt_iscsi_initiator.h SRCS+= bus_if.h device_if.h diff --git a/sys/dev/disk/nata/natacard/Makefile b/sys/dev/disk/nata/natacard/Makefile index 688c929b74..6831f79812 100644 --- a/sys/dev/disk/nata/natacard/Makefile +++ b/sys/dev/disk/nata/natacard/Makefile @@ -2,7 +2,7 @@ KMOD= natacard SRCS= ata-card.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h isa_if.h card_if.h +SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h card_if.h SRCS+= pccarddevs.h .include diff --git a/sys/dev/disk/nata/natadisk/Makefile b/sys/dev/disk/nata/natadisk/Makefile index c476f218a7..082023a032 100644 --- a/sys/dev/disk/nata/natadisk/Makefile +++ b/sys/dev/disk/nata/natadisk/Makefile @@ -2,6 +2,6 @@ KMOD= natadisk SRCS= ata-disk.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h .include diff --git a/sys/dev/disk/nata/natapicam/Makefile b/sys/dev/disk/nata/natapicam/Makefile index 29bd5d660e..5188f6bd18 100644 --- a/sys/dev/disk/nata/natapicam/Makefile +++ b/sys/dev/disk/nata/natapicam/Makefile @@ -2,6 +2,6 @@ KMOD= natapicam SRCS= atapi-cam.c -SRCS+= opt_ata.h opt_scsi.h opt_cam.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= opt_ata.h opt_scsi.h opt_cam.h ata_if.h device_if.h bus_if.h .include diff --git a/sys/dev/disk/nata/natapicd/Makefile b/sys/dev/disk/nata/natapicd/Makefile index de2e4b611f..440776f4c6 100644 --- a/sys/dev/disk/nata/natapicd/Makefile +++ b/sys/dev/disk/nata/natapicd/Makefile @@ -2,6 +2,6 @@ KMOD= natapicd SRCS= atapi-cd.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h .include diff --git a/sys/dev/disk/nata/natapifd/Makefile b/sys/dev/disk/nata/natapifd/Makefile index b4e510bf03..5100a78bff 100644 --- a/sys/dev/disk/nata/natapifd/Makefile +++ b/sys/dev/disk/nata/natapifd/Makefile @@ -2,6 +2,6 @@ KMOD= natapifd SRCS= atapi-fd.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h device_if.h bus_if.h .include diff --git a/sys/dev/disk/nata/natapist/Makefile b/sys/dev/disk/nata/natapist/Makefile index ef3344ee38..380ca0da71 100644 --- a/sys/dev/disk/nata/natapist/Makefile +++ b/sys/dev/disk/nata/natapist/Makefile @@ -2,6 +2,6 @@ KMOD= natapist SRCS= atapi-tape.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h .include diff --git a/sys/dev/disk/sbp/Makefile b/sys/dev/disk/sbp/Makefile index f6ef3aabdc..46100f5aaa 100644 --- a/sys/dev/disk/sbp/Makefile +++ b/sys/dev/disk/sbp/Makefile @@ -1,5 +1,4 @@ # $FreeBSD: src/sys/modules/firewire/sbp/Makefile,v 1.2.2.1 2002/11/03 10:58:21 simokawa Exp $ -# $DragonFly: src/sys/dev/disk/sbp/Makefile,v 1.4 2004/02/05 13:32:08 joerg Exp $ # Makefile for the SBP-II (Serial Bus Protocol 2/SCSI over IEEE1394) @@ -7,10 +6,8 @@ KMOD = sbp SRCS = bus_if.h device_if.h \ - opt_cam.h opt_scsi.h \ - sbp.c sbp.h\ - firewire.h firewirereg.h \ - iec13213.h + opt_cam.h \ + sbp.c .include diff --git a/sys/dev/disk/sdhci/sdhci/Makefile b/sys/dev/disk/sdhci/sdhci/Makefile index 1068ae5472..8d2b753750 100644 --- a/sys/dev/disk/sdhci/sdhci/Makefile +++ b/sys/dev/disk/sdhci/sdhci/Makefile @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/.. KMOD= sdhci -SRCS= sdhci.c sdhci.h sdhci_if.c sdhci_if.h device_if.h bus_if.h mmcbr_if.h +SRCS= sdhci.c sdhci_if.c sdhci_if.h device_if.h bus_if.h mmcbr_if.h .include diff --git a/sys/dev/disk/sdhci/sdhci_acpi/Makefile b/sys/dev/disk/sdhci/sdhci_acpi/Makefile index a583857f2c..370c801c07 100644 --- a/sys/dev/disk/sdhci/sdhci_acpi/Makefile +++ b/sys/dev/disk/sdhci/sdhci_acpi/Makefile @@ -3,7 +3,7 @@ SYSDIR?= ${.CURDIR}/../../../.. KMOD= sdhci_acpi -SRCS= sdhci_acpi.c sdhci.h +SRCS= sdhci_acpi.c SRCS+= sdhci_if.h device_if.h bus_if.h opt_acpi.h pci_if.h acpi_if.h mmcbr_if.h .include "../../../acpica/Makefile.inc" diff --git a/sys/dev/disk/sdhci/sdhci_pci/Makefile b/sys/dev/disk/sdhci/sdhci_pci/Makefile index a5da82cae3..9a1c480b23 100644 --- a/sys/dev/disk/sdhci/sdhci_pci/Makefile +++ b/sys/dev/disk/sdhci/sdhci_pci/Makefile @@ -1,7 +1,7 @@ .PATH: ${.CURDIR}/.. KMOD= sdhci_pci -SRCS= sdhci_pci.c sdhci.h sdhci_if.h device_if.h bus_if.h pci_if.h mmcbr_if.h +SRCS= sdhci_pci.c sdhci_if.h device_if.h bus_if.h pci_if.h mmcbr_if.h .include diff --git a/sys/dev/disk/sili/Makefile b/sys/dev/disk/sili/Makefile index 20d29c1a6c..88014d33b3 100644 --- a/sys/dev/disk/sili/Makefile +++ b/sys/dev/disk/sili/Makefile @@ -3,6 +3,6 @@ KMOD= sili SRCS= sili_dragonfly.c sili_attach.c sili_cam.c sili_pm.c sili.c \ - bus_if.h device_if.h pci_if.h opt_scsi.h opt_cam.h pcidevs.h + bus_if.h device_if.h pci_if.h opt_cam.h pcidevs.h .include diff --git a/sys/dev/disk/sym/Makefile b/sys/dev/disk/sym/Makefile index fd8ca9bb80..392b4b1a85 100644 --- a/sys/dev/disk/sym/Makefile +++ b/sys/dev/disk/sym/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/sys/modules/sym/Makefile,v 1.3 2001/01/06 14:00:24 obrien Exp $ KMOD= sym -SRCS= sym_hipd.c opt_sym.h opt_cam.h opt_scsi.h +SRCS= sym_hipd.c opt_sym.h opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h .include diff --git a/sys/dev/disk/trm/Makefile b/sys/dev/disk/trm/Makefile index b94f368f0d..6db0a887a3 100644 --- a/sys/dev/disk/trm/Makefile +++ b/sys/dev/disk/trm/Makefile @@ -1,8 +1,7 @@ # $FreeBSD: src/sys/modules/trm/Makefile,v 1.1.2.1 2002/11/19 20:47:01 cognet Exp $ KMOD= trm -SRCS= trm.c trm.h opt_cam.h device_if.h bus_if.h \ - opt_scsi.h pci_if.h +SRCS= trm.c opt_cam.h device_if.h bus_if.h pci_if.h .if !defined(BUILDING_WITH_KERNEL) opt_scsi.h: diff --git a/sys/dev/disk/vpo/Makefile b/sys/dev/disk/vpo/Makefile index c21ab00682..977d77c235 100644 --- a/sys/dev/disk/vpo/Makefile +++ b/sys/dev/disk/vpo/Makefile @@ -2,7 +2,7 @@ KMOD= vpo SRCS= bus_if.h device_if.h ppbus_if.h \ - opt_cam.h opt_scsi.h opt_vpo.h \ + opt_cam.h opt_vpo.h \ immio.c vpo.c vpoio.c .include diff --git a/sys/dev/drm/drm/Makefile b/sys/dev/drm/drm/Makefile index 06839bf190..d1332404d4 100644 --- a/sys/dev/drm/drm/Makefile +++ b/sys/dev/drm/drm/Makefile @@ -75,7 +75,7 @@ SRCS = \ ttm_module.c SRCS += device_if.h bus_if.h pci_if.h device_if.h iicbus_if.h opt_drm.h \ - opt_ktr.h opt_vm.h + opt_vm.h KCFLAGS+= -I${SYSDIR}/dev/drm/include KCFLAGS+= -I${SYSDIR}/dev/drm/include/uapi diff --git a/sys/dev/drm/i915/Makefile b/sys/dev/drm/i915/Makefile index 5a2c6f3258..e527ffd10a 100644 --- a/sys/dev/drm/i915/Makefile +++ b/sys/dev/drm/i915/Makefile @@ -94,7 +94,7 @@ SRCS += i915_vgpu.c SRCS += i915_dma.c SRCS += acpi_if.h device_if.h bus_if.h pci_if.h \ - opt_acpi.h opt_drm.h opt_ktr.h + opt_acpi.h opt_drm.h KCFLAGS+= -I${SYSDIR}/dev/drm/include KCFLAGS+= -I${SYSDIR}/dev/drm/include/uapi diff --git a/sys/dev/drm/radeon/Makefile b/sys/dev/drm/radeon/Makefile index a78306bee4..64ce13ca67 100644 --- a/sys/dev/drm/radeon/Makefile +++ b/sys/dev/drm/radeon/Makefile @@ -6,17 +6,6 @@ KMOD = radeonkms -SRCS = \ - rn50_reg_safe.h \ - r100_reg_safe.h \ - r200_reg_safe.h \ - rv515_reg_safe.h \ - r300_reg_safe.h \ - r420_reg_safe.h \ - rs600_reg_safe.h \ - r600_reg_safe.h \ - evergreen_reg_safe.h \ - cayman_reg_safe.h SRCS += \ radeon_acpi.c \ radeon_agp.c \ @@ -135,7 +124,6 @@ SRCS += \ SRCS += \ opt_acpi.h \ opt_drm.h \ - opt_ktr.h \ acpi_if.h \ bus_if.h \ device_if.h \ diff --git a/sys/dev/misc/dcons/dcons/Makefile b/sys/dev/misc/dcons/dcons/Makefile index c421bfdb06..909cf2a7f0 100644 --- a/sys/dev/misc/dcons/dcons/Makefile +++ b/sys/dev/misc/dcons/dcons/Makefile @@ -1,12 +1,11 @@ # $Id: Makefile,v 1.6 2003/10/24 15:41:26 simokawa Exp $ # $FreeBSD: src/sys/modules/dcons/Makefile,v 1.2 2004/07/13 09:37:49 simokawa Exp $ -# $DragonFly: src/sys/dev/misc/dcons/dcons/Makefile,v 1.5 2006/10/25 20:55:54 dillon Exp $ .PATH: ${.CURDIR}/.. KMOD = dcons SRCS = dcons.c dcons_os.c -SRCS += dcons.h dcons_os.h opt_dcons.h opt_ddb.h opt_comconsole.h +SRCS += opt_dcons.h opt_ddb.h opt_comconsole.h SRCS += device_if.h bus_if.h .if !defined(BUILDING_WITH_KERNEL) diff --git a/sys/dev/misc/dcons/dcons_crom/Makefile b/sys/dev/misc/dcons/dcons_crom/Makefile index e5e3be1b73..99230129a6 100644 --- a/sys/dev/misc/dcons/dcons_crom/Makefile +++ b/sys/dev/misc/dcons/dcons_crom/Makefile @@ -1,11 +1,9 @@ # $Id: Makefile,v 1.6 2003/10/24 15:43:24 simokawa Exp $ # $FreeBSD: src/sys/modules/dcons_crom/Makefile,v 1.1 2003/10/24 15:44:10 simokawa Exp $ -# $DragonFly: src/sys/dev/misc/dcons/dcons_crom/Makefile,v 1.3 2004/10/25 13:53:27 simokawa Exp $ .PATH: ${.CURDIR}/.. KMOD = dcons_crom -SRCS = dcons_crom.c dcons.h dcons_os.h \ - bus_if.h device_if.h +SRCS = dcons_crom.c bus_if.h device_if.h .include diff --git a/sys/dev/misc/putter/Makefile b/sys/dev/misc/putter/Makefile index c9171e7783..e037dbe2f6 100644 --- a/sys/dev/misc/putter/Makefile +++ b/sys/dev/misc/putter/Makefile @@ -1,5 +1,5 @@ KMOD= putter -SRCS= putter.c putter.h putter_sys.h +SRCS= putter.c #DEBUG_FLAGS+= -DPUTTERDEBUG diff --git a/sys/dev/netif/ath/ath_dfs/null/Makefile b/sys/dev/netif/ath/ath_dfs/null/Makefile index 40688001a0..eda76c6d8a 100644 --- a/sys/dev/netif/ath/ath_dfs/null/Makefile +++ b/sys/dev/netif/ath/ath_dfs/null/Makefile @@ -3,6 +3,6 @@ KMOD= ath_dfs SRCS= dfs_null.c -SRCS+= device_if.h bus_if.h pci_if.h opt_ah.h opt_wlan.h opt_inet.h opt_ath.h +SRCS+= device_if.h bus_if.h opt_ah.h opt_wlan.h opt_inet.h opt_ath.h .include diff --git a/sys/dev/netif/ath/ath_rate/sample/Makefile b/sys/dev/netif/ath/ath_rate/sample/Makefile index bccda2645d..159142be1b 100644 --- a/sys/dev/netif/ath/ath_rate/sample/Makefile +++ b/sys/dev/netif/ath/ath_rate/sample/Makefile @@ -3,6 +3,6 @@ KMOD= ath_rate SRCS= sample.c -SRCS+= device_if.h bus_if.h pci_if.h opt_ah.h opt_wlan.h opt_inet.h opt_ath.h +SRCS+= device_if.h bus_if.h opt_ah.h opt_wlan.h opt_inet.h opt_ath.h .include diff --git a/sys/dev/netif/iwi/Makefile b/sys/dev/netif/iwi/Makefile index d71c746a90..f8ff18b82c 100644 --- a/sys/dev/netif/iwi/Makefile +++ b/sys/dev/netif/iwi/Makefile @@ -2,8 +2,7 @@ KMOD = if_iwi SRCS = if_iwi.c \ device_if.h \ bus_if.h \ - pci_if.h \ - opt_inet.h + pci_if.h SUBDIR = fw diff --git a/sys/dev/netif/iwm/Makefile b/sys/dev/netif/iwm/Makefile index 7ac869208d..7f40c21711 100644 --- a/sys/dev/netif/iwm/Makefile +++ b/sys/dev/netif/iwm/Makefile @@ -6,7 +6,7 @@ SRCS += if_iwm_binding.c if_iwm_phy_ctxt.c if_iwm_scan.c if_iwm_led.c SRCS += if_iwm_mac_ctxt.c if_iwm_phy_db.c if_iwm_time_event.c SRCS += if_iwm_notif_wait.c if_iwm_7000.c if_iwm_8000.c if_iwm_fw.c SRCS += if_iwm_sta.c if_iwm_sf.c -SRCS += device_if.h bus_if.h pci_if.h opt_iwm.h opt_wlan.h +SRCS += device_if.h bus_if.h pci_if.h opt_iwm.h SUBDIR = fw diff --git a/sys/dev/netif/lnc/Makefile b/sys/dev/netif/lnc/Makefile index ee3e803d63..a424b6f2ae 100644 --- a/sys/dev/netif/lnc/Makefile +++ b/sys/dev/netif/lnc/Makefile @@ -1,5 +1,5 @@ KMOD = if_lnc SRCS = lance.c if_lnc_pci.c am7990.c am79900.c -SRCS += device_if.h bus_if.h pci_if.h opt_inet.h +SRCS += device_if.h bus_if.h pci_if.h .include diff --git a/sys/dev/netif/wpi/Makefile b/sys/dev/netif/wpi/Makefile index 7881f198a2..ea28d5694a 100644 --- a/sys/dev/netif/wpi/Makefile +++ b/sys/dev/netif/wpi/Makefile @@ -1,6 +1,5 @@ KMOD = if_wpi SRCS = if_wpi.c device_if.h bus_if.h pci_if.h opt_wlan.h opt_wpi.h -SRCS += miibus_if.h SUBDIR = fw diff --git a/sys/dev/netif/xe/Makefile b/sys/dev/netif/xe/Makefile index b0bb7ad0df..daec62c166 100644 --- a/sys/dev/netif/xe/Makefile +++ b/sys/dev/netif/xe/Makefile @@ -2,7 +2,6 @@ KMOD = if_xe SRCS = if_xe.c if_xe_pccard.c \ - device_if.h card_if.h pccarddevs.h bus_if.h pci_if.h -SRCS += if_xevar.h if_xereg.h + device_if.h card_if.h pccarddevs.h bus_if.h .include diff --git a/sys/dev/powermng/alpm/Makefile b/sys/dev/powermng/alpm/Makefile index b76df15d16..85e82a0926 100644 --- a/sys/dev/powermng/alpm/Makefile +++ b/sys/dev/powermng/alpm/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/sys/modules/i2c/controllers/alpm/Makefile,v 1.2 2007/06/24 20:35:58 njl Exp $ KMOD = alpm -SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ +SRCS = device_if.h bus_if.h smbus_if.h pci_if.h \ alpm.c .include diff --git a/sys/dev/powermng/intpm/Makefile b/sys/dev/powermng/intpm/Makefile index 67759c14b8..15c92494df 100644 --- a/sys/dev/powermng/intpm/Makefile +++ b/sys/dev/powermng/intpm/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/sys/modules/i2c/controllers/intpm/Makefile,v 1.1 2002/03/23 15:48:42 nsouch Exp $ KMOD = intpm -SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ - opt_intpm.h intpmreg.h intpm.c +SRCS = device_if.h bus_if.h smbus_if.h pci_if.h \ + opt_intpm.h intpm.c .include diff --git a/sys/dev/powermng/viapm/Makefile b/sys/dev/powermng/viapm/Makefile index 1f112d0f2b..f5e878be7d 100644 --- a/sys/dev/powermng/viapm/Makefile +++ b/sys/dev/powermng/viapm/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/sys/modules/i2c/controllers/viapm/Makefile,v 1.3 2007/06/24 20:35:59 njl Exp $ KMOD = viapm -SRCS = device_if.h bus_if.h iicbb_if.h isa_if.h pci_if.h smbus_if.h \ +SRCS = device_if.h bus_if.h iicbb_if.h pci_if.h smbus_if.h \ viapm.c .include diff --git a/sys/dev/raid/aac/Makefile b/sys/dev/raid/aac/Makefile index a6a80b42cf..3f4c0f9053 100644 --- a/sys/dev/raid/aac/Makefile +++ b/sys/dev/raid/aac/Makefile @@ -2,7 +2,7 @@ KMOD= aac SRCS= aac.c aac_pci.c aac_disk.c aac_cam.c -SRCS+= opt_scsi.h opt_cam.h opt_aac.h +SRCS+= opt_cam.h opt_aac.h SRCS+= device_if.h bus_if.h pci_if.h # To enable debug output from the driver, uncomment these two lines. diff --git a/sys/dev/raid/amr/amr_cam/Makefile b/sys/dev/raid/amr/amr_cam/Makefile index 9e4a28e9d9..bb7da2fb5c 100644 --- a/sys/dev/raid/amr/amr_cam/Makefile +++ b/sys/dev/raid/amr/amr_cam/Makefile @@ -4,6 +4,6 @@ KMOD= amr_cam SRCS= amr_cam.c device_if.h bus_if.h -SRCS+= opt_amr.h opt_cam.h opt_scsi.h +SRCS+= opt_amr.h opt_cam.h .include diff --git a/sys/dev/raid/arcmsr/Makefile b/sys/dev/raid/arcmsr/Makefile index 377677f27e..1bdf16d23f 100644 --- a/sys/dev/raid/arcmsr/Makefile +++ b/sys/dev/raid/arcmsr/Makefile @@ -2,7 +2,7 @@ KMOD= arcmsr SRCS= arcmsr.c -SRCS+= opt_scsi.h opt_cam.h +SRCS+= opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h .include diff --git a/sys/dev/raid/asr/Makefile b/sys/dev/raid/asr/Makefile index 7a08f710de..911327d307 100644 --- a/sys/dev/raid/asr/Makefile +++ b/sys/dev/raid/asr/Makefile @@ -2,7 +2,7 @@ KMOD= asr SRCS= asr.c -SRCS+= opt_scsi.h opt_cam.h +SRCS+= opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h .include diff --git a/sys/dev/raid/ciss/Makefile b/sys/dev/raid/ciss/Makefile index 376206ebc1..e64f0eed28 100644 --- a/sys/dev/raid/ciss/Makefile +++ b/sys/dev/raid/ciss/Makefile @@ -2,7 +2,7 @@ KMOD = ciss SRCS = ciss.c -SRCS += opt_scsi.h opt_cam.h opt_ddb.h +SRCS += opt_cam.h SRCS += device_if.h bus_if.h pci_if.h #CFLAGS +=-DCISS_DEBUG diff --git a/sys/dev/raid/hpt27xx/Makefile b/sys/dev/raid/hpt27xx/Makefile index bafc9875d1..088e806838 100644 --- a/sys/dev/raid/hpt27xx/Makefile +++ b/sys/dev/raid/hpt27xx/Makefile @@ -2,7 +2,7 @@ KMOD= hpt27xx SRCS= bus_if.h device_if.h pci_if.h -SRCS+= opt_cam.h opt_scsi.h +SRCS+= opt_cam.h SRCS+= hpt27xx_os_bsd.c hpt27xx_osm_bsd.c hpt27xx_config.c OBJS+= hpt27xx_lib.bo diff --git a/sys/dev/raid/hptiop/Makefile b/sys/dev/raid/hptiop/Makefile index 6c3b5af628..2cd1115033 100644 --- a/sys/dev/raid/hptiop/Makefile +++ b/sys/dev/raid/hptiop/Makefile @@ -2,7 +2,7 @@ KMOD= hptiop SRCS= hptiop.c -SRCS+= opt_scsi.h opt_cam.h +SRCS+= opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h .include diff --git a/sys/dev/raid/hptmv/Makefile b/sys/dev/raid/hptmv/Makefile index dc5e789dc2..337cd2d3a7 100644 --- a/sys/dev/raid/hptmv/Makefile +++ b/sys/dev/raid/hptmv/Makefile @@ -5,7 +5,7 @@ # $FreeBSD: src/sys/modules/hptmv/Makefile,v 1.5 2010/08/23 06:13:29 imp Exp $ KMOD= hptmv -SRCS= opt_scsi.h opt_cam.h +SRCS= opt_cam.h SRCS+= bus_if.h device_if.h pci_if.h SRCS+= mv.c entry.c ioctl.c hptproc.c gui_lib.c OBJS+= hptmvraid.bo diff --git a/sys/dev/raid/hptrr/Makefile b/sys/dev/raid/hptrr/Makefile index 7924a6235f..10ff15598e 100644 --- a/sys/dev/raid/hptrr/Makefile +++ b/sys/dev/raid/hptrr/Makefile @@ -2,7 +2,7 @@ # $FreeBSD: head/sys/modules/hptrr/Makefile 314651 2017-03-04 10:10:17Z ngie $ KMOD = hptrr -SRCS = opt_scsi.h opt_cam.h bus_if.h device_if.h pci_if.h os_bsd.h +SRCS = opt_cam.h bus_if.h device_if.h pci_if.h SRCS+= hptrr_os_bsd.c hptrr_osm_bsd.c hptrr_config.c OBJS = hptrr_lib.bo diff --git a/sys/dev/raid/iir/Makefile b/sys/dev/raid/iir/Makefile index 7fed468d7c..95f0b588e7 100644 --- a/sys/dev/raid/iir/Makefile +++ b/sys/dev/raid/iir/Makefile @@ -3,7 +3,7 @@ KMOD= iir SRCS= iir.c iir_ctrl.c iir_pci.c -SRCS+= opt_scsi.h opt_cam.h +SRCS+= opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h pcidevs.h .include diff --git a/sys/dev/raid/ips/Makefile b/sys/dev/raid/ips/Makefile index 21b193e469..4d6db74c8b 100644 --- a/sys/dev/raid/ips/Makefile +++ b/sys/dev/raid/ips/Makefile @@ -1,7 +1,5 @@ -# $DragonFly: src/sys/dev/raid/ips/Makefile,v 1.2 2004/09/06 16:30:10 joerg Exp $ - KMOD= ips -SRCS= ips.c ips.h ips_commands.c ips_disk.c ips_disk.h ips_ioctl.c -SRCS+= ips_ioctl.h ips_pci.c device_if.h bus_if.h pci_if.h +SRCS= ips.c ips_commands.c ips_disk.c ips_ioctl.c ips_pci.c +SRCS+= device_if.h bus_if.h pci_if.h .include diff --git a/sys/dev/raid/mfi/Makefile b/sys/dev/raid/mfi/Makefile index 6932492443..aaa693c54a 100644 --- a/sys/dev/raid/mfi/Makefile +++ b/sys/dev/raid/mfi/Makefile @@ -4,7 +4,7 @@ SUBDIR= mfip KMOD= mfi SRCS= mfi.c mfi_pci.c mfi_disk.c mfi_debug.c mfi_syspd.c mfi_tbolt.c -SRCS+= opt_mfi.h opt_cam.h +SRCS+= opt_mfi.h SRCS+= device_if.h bus_if.h pci_if.h #CFLAGS += -DMFI_DEBUG diff --git a/sys/dev/raid/mfi/mfip/Makefile b/sys/dev/raid/mfi/mfip/Makefile index 467025fad3..8eababa142 100644 --- a/sys/dev/raid/mfi/mfip/Makefile +++ b/sys/dev/raid/mfi/mfip/Makefile @@ -5,6 +5,6 @@ KMOD= mfip SRCS= mfi_cam.c SRCS+= opt_mfi.h opt_cam.h -SRCS+= device_if.h bus_if.h pci_if.h +SRCS+= device_if.h bus_if.h .include diff --git a/sys/dev/raid/mly/Makefile b/sys/dev/raid/mly/Makefile index 34aa88aa8c..7240b7a2d6 100644 --- a/sys/dev/raid/mly/Makefile +++ b/sys/dev/raid/mly/Makefile @@ -2,7 +2,7 @@ KMOD= mly SRCS= mly.c -SRCS+= opt_scsi.h opt_cam.h +SRCS+= opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h #CFLAGS+= -DMLY_DEBUG=3 diff --git a/sys/dev/raid/mrsas/Makefile b/sys/dev/raid/mrsas/Makefile index 77bc398b90..80ecdb3ee5 100644 --- a/sys/dev/raid/mrsas/Makefile +++ b/sys/dev/raid/mrsas/Makefile @@ -2,7 +2,7 @@ KMOD= mrsas SRCS= mrsas.c mrsas_cam.c mrsas_ioctl.c mrsas_fp.c -SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h opt_scsi.h +SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h #CFLAGS+= -DMRSAS_DEBUG .include diff --git a/sys/dev/raid/twa/Makefile b/sys/dev/raid/twa/Makefile index e6cf930a15..cf78c0685d 100644 --- a/sys/dev/raid/twa/Makefile +++ b/sys/dev/raid/twa/Makefile @@ -35,7 +35,7 @@ KMOD = twa SRCS= tw_osl_freebsd.c tw_osl_cam.c \ tw_cl_init.c tw_cl_io.c tw_cl_intr.c tw_cl_misc.c \ - bus_if.h device_if.h pci_if.h opt_scsi.h opt_cam.h opt_twa.h + bus_if.h device_if.h pci_if.h opt_cam.h opt_twa.h # Uncomment the following line to turn on Enclosure Services support. #CFLAGS+= -DTWA_ENCLOSURE_SUPPORT diff --git a/sys/dev/raid/tws/Makefile b/sys/dev/raid/tws/Makefile index 8781c53906..bf11a65cc4 100644 --- a/sys/dev/raid/tws/Makefile +++ b/sys/dev/raid/tws/Makefile @@ -3,6 +3,6 @@ KMOD= tws SRCS= tws.c tws_services.c tws_cam.c tws_hdm.c tws_user.c -SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h opt_scsi.h +SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h .include diff --git a/sys/dev/raid/vinum/Makefile b/sys/dev/raid/vinum/Makefile index 3e277645a6..4108634961 100644 --- a/sys/dev/raid/vinum/Makefile +++ b/sys/dev/raid/vinum/Makefile @@ -1,12 +1,11 @@ # $FreeBSD: src/sys/modules/vinum/Makefile,v 1.17 2000/01/04 23:46:41 grog Exp $ -# $DragonFly: src/sys/dev/raid/vinum/Makefile,v 1.5 2005/02/03 22:10:57 joerg Exp $ KMOD= vinum -SRCS= opt_vinum.h request.h vinum.c vinumconfig.c vinumdaemon.c \ - vinumext.h vinumhdr.h vinuminterrupt.c vinumio.c vinumio.h \ - vinumioctl.c vinumkw.h vinumlock.c vinummemory.c vinumparser.c \ +SRCS= opt_vinum.h vinum.c vinumconfig.c vinumdaemon.c \ + vinuminterrupt.c vinumio.c \ + vinumioctl.c vinumlock.c vinummemory.c vinumparser.c \ vinumraid5.c vinumrequest.c vinumrevive.c vinumstate.c \ - vinumstate.h vinumutil.c vinumvar.h + vinumutil.c .include diff --git a/sys/dev/sound/driver/hda/Makefile b/sys/dev/sound/driver/hda/Makefile index fd798f7ea2..6694fdbeb6 100644 --- a/sys/dev/sound/driver/hda/Makefile +++ b/sys/dev/sound/driver/hda/Makefile @@ -5,8 +5,8 @@ KMOD= snd_hda SRCS= device_if.h bus_if.h pci_if.h channel_if.h mixer_if.h hdac_if.h -SRCS+= hdaa.c hdaa.h hdaa_patches.c hdac.c hdac_if.h hdac_if.c -SRCS+= hdacc.c hdac_private.h hdac_reg.h hda_reg.h hdac.h +SRCS+= hdaa.c hdaa_patches.c hdac.c hdac_if.h hdac_if.c +SRCS+= hdacc.c SRCS+= hda_acer_c720_patch.c .include diff --git a/sys/dev/sound/driver/hdspe/Makefile b/sys/dev/sound/driver/hdspe/Makefile index 24e18c433e..826a777827 100644 --- a/sys/dev/sound/driver/hdspe/Makefile +++ b/sys/dev/sound/driver/hdspe/Makefile @@ -4,6 +4,6 @@ KMOD= snd_hdspe SRCS= device_if.h bus_if.h pci_if.h -SRCS+= hdspe.c hdspe-pcm.c hdspe.h +SRCS+= hdspe.c hdspe-pcm.c .include diff --git a/sys/dev/sound/driver/spicds/Makefile b/sys/dev/sound/driver/spicds/Makefile index 2114562cd2..b0e5233f09 100644 --- a/sys/dev/sound/driver/spicds/Makefile +++ b/sys/dev/sound/driver/spicds/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../pci KMOD= snd_spicds -SRCS= device_if.h bus_if.h pci_if.h +SRCS= device_if.h bus_if.h SRCS+= spicds.c .include diff --git a/sys/dev/video/cxm/cxm/Makefile b/sys/dev/video/cxm/cxm/Makefile index c3fcd36dbf..2a0a10d661 100644 --- a/sys/dev/video/cxm/cxm/Makefile +++ b/sys/dev/video/cxm/cxm/Makefile @@ -1,6 +1,6 @@ .PATH: ${.CURDIR}/.. KMOD = cxm -SRCS = cxm.c cxm.h cxm_dec_fw.c cxm_enc_fw.c cxm_msp34xxx.c cxm_eeprom.c \ +SRCS = cxm.c cxm_dec_fw.c cxm_enc_fw.c cxm_msp34xxx.c cxm_eeprom.c \ cxm_ir.c cxm_tuner.c cxm_saa7115.c \ bus_if.h device_if.h iicbb_if.h pci_if.h pcidevs.h diff --git a/sys/dev/video/cxm/cxm_iic/Makefile b/sys/dev/video/cxm/cxm_iic/Makefile index be222c4caa..43469a5d8f 100644 --- a/sys/dev/video/cxm/cxm_iic/Makefile +++ b/sys/dev/video/cxm/cxm_iic/Makefile @@ -1,6 +1,6 @@ .PATH: ${.CURDIR}/.. KMOD = cxm_iic -SRCS = cxm_i2c.c cxm.h \ +SRCS = cxm_i2c.c \ bus_if.h device_if.h iicbb_if.h pci_if.h pcidevs.h .include diff --git a/sys/dev/video/vga/Makefile b/sys/dev/video/vga/Makefile index 41a1446390..cb8366f392 100755 --- a/sys/dev/video/vga/Makefile +++ b/sys/dev/video/vga/Makefile @@ -1,6 +1,6 @@ KMOD= vga_switcheroo SRCS= vga_switcheroo.c -SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h +SRCS+= device_if.h bus_if.h pci_if.h KCFLAGS+= -I${SYSDIR}/dev/drm/include diff --git a/sys/dev/virtual/virtio/balloon/Makefile b/sys/dev/virtual/virtio/balloon/Makefile index 99f36abdc4..11b0a8fd70 100644 --- a/sys/dev/virtual/virtio/balloon/Makefile +++ b/sys/dev/virtual/virtio/balloon/Makefile @@ -25,7 +25,6 @@ KMOD= virtio_balloon SRCS= virtio_balloon.c -SRCS+= virtio_bus_if.h SRCS+= bus_if.h device_if.h #KCFLAGS+= -DINVARIANTS -DDEBUG diff --git a/sys/dev/virtual/virtio/block/Makefile b/sys/dev/virtual/virtio/block/Makefile index 4a674b89c5..11d2b94718 100644 --- a/sys/dev/virtual/virtio/block/Makefile +++ b/sys/dev/virtual/virtio/block/Makefile @@ -25,7 +25,6 @@ KMOD= virtio_blk SRCS= virtio_blk.c -SRCS+= virtio_bus_if.h SRCS+= bus_if.h device_if.h .include diff --git a/sys/dev/virtual/virtio/net/Makefile b/sys/dev/virtual/virtio/net/Makefile index 9855c2605f..d9476508ae 100644 --- a/sys/dev/virtual/virtio/net/Makefile +++ b/sys/dev/virtual/virtio/net/Makefile @@ -1,6 +1,5 @@ KMOD= if_vtnet SRCS= if_vtnet.c -SRCS+= virtio_bus_if.h SRCS+= bus_if.h device_if.h SRCS+= opt_ifpoll.h diff --git a/sys/dev/virtual/virtio/random/Makefile b/sys/dev/virtual/virtio/random/Makefile index 5d81ef77c3..fca51b53f6 100644 --- a/sys/dev/virtual/virtio/random/Makefile +++ b/sys/dev/virtual/virtio/random/Makefile @@ -25,7 +25,6 @@ KMOD= virtio_random SRCS= virtio_random.c -SRCS+= virtio_bus_if.h SRCS+= bus_if.h device_if.h .include diff --git a/sys/dev/virtual/virtio/scsi/Makefile b/sys/dev/virtual/virtio/scsi/Makefile index 7dfe83fa7c..0c72104674 100644 --- a/sys/dev/virtual/virtio/scsi/Makefile +++ b/sys/dev/virtual/virtio/scsi/Makefile @@ -25,7 +25,6 @@ KMOD= virtio_scsi SRCS= virtio_scsi.c -SRCS+= virtio_bus_if.h -SRCS+= bus_if.h device_if.h opt_scsi.h opt_cam.h +SRCS+= bus_if.h device_if.h opt_cam.h .include diff --git a/sys/libiconv/Makefile b/sys/libiconv/Makefile index 070aa1cabf..bae715dec0 100644 --- a/sys/libiconv/Makefile +++ b/sys/libiconv/Makefile @@ -4,7 +4,6 @@ KMOD= libiconv SRCS= iconv.c iconv_ucs.c iconv_xlat.c iconv_xlat16.c -SRCS+= iconv.h SRCS+= iconv_converter_if.c iconv_converter_if.h EXPORT_SYMS= iconv_add \ diff --git a/sys/net/gif/Makefile b/sys/net/gif/Makefile index 901118349e..647a7e3d00 100644 --- a/sys/net/gif/Makefile +++ b/sys/net/gif/Makefile @@ -1,10 +1,9 @@ # $FreeBSD: src/sys/modules/if_gif/Makefile,v 1.1.2.1 2001/07/24 19:10:17 brooks Exp $ -# $DragonFly: src/sys/net/gif/Makefile,v 1.4 2006/10/25 20:56:02 dillon Exp $ .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 KMOD= if_gif -SRCS= if_gif.c in_gif.c in6_gif.c opt_inet.h opt_inet6.h opt_mrouting.h +SRCS= if_gif.c in_gif.c in6_gif.c opt_inet.h opt_inet6.h SRCS+= device_if.h bus_if.h .if !defined(BUILDING_WITH_KERNEL) diff --git a/sys/net/ipfw3/Makefile b/sys/net/ipfw3/Makefile index b7176499b2..d1a0cb1bb5 100644 --- a/sys/net/ipfw3/Makefile +++ b/sys/net/ipfw3/Makefile @@ -1,7 +1,7 @@ KMOD= ipfw3 SRCS= opt_fw3.h -SRCS= ip_fw3.c ip_fw3.h -SRCS+= ip_fw3_set.c ip_fw3_set.h +SRCS= ip_fw3.c +SRCS+= ip_fw3_set.c SRCS+= opt_ipfw.h opt_inet.h .ifndef BUILDING_WITH_KERNEL diff --git a/sys/net/ipfw3_basic/Makefile b/sys/net/ipfw3_basic/Makefile index 2c9e3854e1..7c690b3a5d 100644 --- a/sys/net/ipfw3_basic/Makefile +++ b/sys/net/ipfw3_basic/Makefile @@ -1,9 +1,9 @@ KMOD= ipfw3_basic -SRCS= ip_fw3_basic.c ip_fw3_basic.h -SRCS+= ip_fw3_log.c ip_fw3_log.h -SRCS+= ip_fw3_state.c ip_fw3_state.h -SRCS+= ip_fw3_table.c ip_fw3_table.h -SRCS+= ip_fw3_sync.c ip_fw3_sync.h +SRCS= ip_fw3_basic.c +SRCS+= ip_fw3_log.c +SRCS+= ip_fw3_state.c +SRCS+= ip_fw3_table.c +SRCS+= ip_fw3_sync.c SRCS+= opt_ipfw.h opt_inet.h .ifndef BUILDING_WITH_KERNEL @@ -22,4 +22,4 @@ opt_ipfw.h: #echo '#define IPFIREWALL_DEFAULT_TO_ACCEPT 1' >> ${.OBJDIR}/${.TARGET} .endif -.include \ No newline at end of file +.include diff --git a/sys/net/netmap/Makefile b/sys/net/netmap/Makefile index b54c4eefe9..600b51e7de 100644 --- a/sys/net/netmap/Makefile +++ b/sys/net/netmap/Makefile @@ -3,10 +3,10 @@ KMOD = netmap SRCS = device_if.h bus_if.h opt_netmap.h -SRCS += netmap.c netmap_kern.h -SRCS += netmap_mem2.c netmap_mem2.h +SRCS += netmap.c +SRCS += netmap_mem2.c SRCS += netmap_generic.c -SRCS += netmap_mbq.c netmap_mbq.h +SRCS += netmap_mbq.c SRCS += netmap_vale.c SRCS += netmap_freebsd.c diff --git a/sys/net/pf/Makefile b/sys/net/pf/Makefile index d5c7b3b41c..6eac39f67e 100644 --- a/sys/net/pf/Makefile +++ b/sys/net/pf/Makefile @@ -1,7 +1,7 @@ KMOD= pf SRCS= if_pflog.c if_pfsync.c pf.c pf_if.c pf_ioctl.c pf_norm.c pf_osfp.c pf_subr.c SRCS+= pf_table.c pf_ruleset.c -SRCS+= use_bpf.h use_pflog.h use_pfsync.h opt_inet.h opt_inet6.h opt_carp.h +SRCS+= use_bpf.h use_pflog.h opt_inet.h opt_inet6.h opt_carp.h SRCS+= opt_icmp_bandlim.h use_pflog.h: diff --git a/sys/netbt/Makefile b/sys/netbt/Makefile index bdadc9a24b..a2fa0481e6 100644 --- a/sys/netbt/Makefile +++ b/sys/netbt/Makefile @@ -1,12 +1,9 @@ -# $DragonFly: src/sys/netbt/Makefile,v 1.1 2007/12/30 20:02:56 hasso Exp $ - KMOD = netbt SRCS = sco_socket.c sco_upper.c bt_input.c bt_proto.c hci_event.c hci_ioctl.c SRCS += hci_link.c hci_misc.c hci_socket.c hci_unit.c l2cap_lower.c SRCS += l2cap_misc.c l2cap_signal.c l2cap_socket.c l2cap_upper.c SRCS += rfcomm_dlc.c rfcomm_session.c rfcomm_socket.c rfcomm_upper.c -SRCS += bluetooth.h hci.h l2cap.h rfcomm.h sco.h -SRCS += opt_usb.h device_if.h bus_if.h +SRCS += device_if.h bus_if.h .include diff --git a/sys/netproto/802_11/wlan/Makefile b/sys/netproto/802_11/wlan/Makefile index 2412b54ce3..196472d7ea 100644 --- a/sys/netproto/802_11/wlan/Makefile +++ b/sys/netproto/802_11/wlan/Makefile @@ -11,7 +11,7 @@ SRCS += ieee80211_regdomain.c SRCS += ieee80211_scan.c ieee80211_scan_sta.c ieee80211_scan_sw.c SRCS += ieee80211_sta.c ieee80211_superg.c ieee80211_tdma.c SRCS += ieee80211_wds.c -SRCS += bus_if.h device_if.h opt_inet.h opt_inet6.h opt_wlan.h +SRCS += opt_inet.h opt_inet6.h opt_wlan.h SRCS += opt_tdma.h opt_ddb.h .if !defined(BUILDING_WITH_KERNEL) diff --git a/sys/vfs/puffs/Makefile b/sys/vfs/puffs/Makefile index c8a2cb3fd7..f5765eaaac 100644 --- a/sys/vfs/puffs/Makefile +++ b/sys/vfs/puffs/Makefile @@ -1,6 +1,6 @@ KMOD= puffs -SRCS= puffs_msgif.c puffs_msgif.h puffs_node.c puffs_subr.c \ - puffs_sys.h puffs_vfsops.c puffs_vnops.c puffs_io.c +SRCS= puffs_msgif.c puffs_node.c puffs_subr.c \ + puffs_vfsops.c puffs_vnops.c puffs_io.c #DEBUG_FLAGS+= -DPUFFSDEBUG diff --git a/sys/vfs/smbfs/Makefile b/sys/vfs/smbfs/Makefile index b465f08aa1..b6cee317ab 100644 --- a/sys/vfs/smbfs/Makefile +++ b/sys/vfs/smbfs/Makefile @@ -7,9 +7,7 @@ KMOD= smbfs -SRCS= opt_inet.h \ - opt_netsmb.h \ - iconv_converter_if.h \ +SRCS= opt_netsmb.h \ md4c.c \ smb_conn.c smb_dev.c smb_trantcp.c smb_smb.c smb_subr.c smb_rq.c \ smb_usr.c smb_crypt.c smb_iod.c \ -- 2.41.0