kbuild: Simplify linking subdirs in drivers/*/Makefile

Use the new

	obj-$(CONFIG_FOO) += foo/

syntax to descend into a subdir and link in the result, if
CONFIG_FOO=y.

diff --git a/drivers/acorn/scsi/Makefile b/drivers/acorn/scsi/Makefile
index c88d44ebb6a9b6db9be4cfd82f2e89b303a5001b..f222a3c01178568ea6ff6ad47f88b4ad2952dc4e 100644 (file)
--- a/drivers/acorn/scsi/Makefile
+++ b/drivers/acorn/scsi/Makefile
@@ -2,13 +2,6 @@
 # Makefile for drivers/acorn/scsi
 #
 
-O_TARGET       := acorn-scsi.o
-
-obj-y          :=
-obj-m          :=
-obj-n          :=
-obj-           :=
-
 export-objs            := fas216.o queue.o msgqueue.o
 acornscsi_mod-objs     := acornscsi.o acornscsi-io.o
 

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 41b911226bb678bc3b4ddab29f51d66dfd4b5562..2789d71fc9e5eb148c5d5c050859a62b117c2cdd 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -182,14 +182,8 @@ obj-$(CONFIG_TOSHIBA) += toshiba.o
 obj-$(CONFIG_I8K) += i8k.o
 obj-$(CONFIG_DS1620) += ds1620.o
 obj-$(CONFIG_INTEL_RNG) += i810_rng.o
-
 obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
-
-subdir-$(CONFIG_FTAPE) += ftape
-ifeq ($(CONFIG_FTAPE),y)
-  obj-y       += ftape/ftape.o
-endif
-
+obj-$(CONFIG_FTAPE) += ftape/
 obj-$(CONFIG_H8) += h8.o
 obj-$(CONFIG_PPDEV) += ppdev.o
 obj-$(CONFIG_DZ) += dz.o
@@ -216,23 +210,10 @@ obj-$(CONFIG_MACHZ_WDT) += machzwd.o
 obj-$(CONFIG_SH_WDT) += shwdt.o
 obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
-
 obj-$(CONFIG_MWAVE) += mwave/
-
-subdir-$(CONFIG_AGP) += agp
-ifeq ($(CONFIG_AGP),y)
-  obj-y += agp/agp.o
-endif
-
-subdir-$(CONFIG_DRM) += drm
-ifeq ($(CONFIG_DRM),y)
-  obj-y += drm/drm.o
-endif
-
-subdir-$(CONFIG_PCMCIA) += pcmcia
-ifeq ($(CONFIG_PCMCIA),y)
-  obj-y += pcmcia/pcmcia_char.o
-endif
+obj-$(CONFIG_AGP) += agp/
+obj-$(CONFIG_DRM) += drm/
+obj-$(CONFIG_PCMCIA) += pcmcia/
 
 include $(TOPDIR)/Rules.make
 

diff --git a/drivers/char/agp/Makefile b/drivers/char/agp/Makefile
index 4b8ee1713eda0762c63e740b8c929e81bdc3d430..8c78cba4f66ee5eb7a24030cd43252ac4ab12717 100644 (file)
--- a/drivers/char/agp/Makefile
+++ b/drivers/char/agp/Makefile
@@ -3,8 +3,6 @@
 # space ioctl interface to use agp memory.  It also adds a kernel interface
 # that other drivers could use to manipulate agp memory.
 
-O_TARGET       := agp.o
-
 export-objs := agpgart_be.o
 
 agpgart-objs := agpgart_fe.o agpgart_be.o

diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
index 5b000a45ca7107e6043450d87bcd0f35b776d9e9..b7da9f2a71af3c9aba39efaa18afaad5d15360c7 100644 (file)
--- a/drivers/char/drm/Makefile
+++ b/drivers/char/drm/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-O_TARGET       := drm.o
-
 gamma-objs  := gamma_drv.o gamma_dma.o
 tdfx-objs   := tdfx_drv.o
 r128-objs   := r128_drv.o r128_cce.o r128_state.o

diff --git a/drivers/char/ftape/Makefile b/drivers/char/ftape/Makefile
index 47e754964cf3ab3cdebeef692fc268ac2e399057..7bcf0642455e52583b8d1fc1c0948ee85dfbdc01 100644 (file)
--- a/drivers/char/ftape/Makefile
+++ b/drivers/char/ftape/Makefile
@@ -23,8 +23,6 @@
 #      Linux.
 #
 
-O_TARGET := ftape.o
-
 obj-$(CONFIG_FTAPE)            += lowlevel/
 obj-$(CONFIG_ZFTAPE)           += zftape/
 obj-$(CONFIG_ZFT_COMPRESSOR)   += compressor/

diff --git a/drivers/char/pcmcia/Makefile b/drivers/char/pcmcia/Makefile
index 2e61548788f05fcf65d8550605356876fed08df6..0b499b55814b03573f8f8ed42fa434370717b015 100644 (file)
--- a/drivers/char/pcmcia/Makefile
+++ b/drivers/char/pcmcia/Makefile
@@ -4,8 +4,6 @@
 # Makefile for the Linux PCMCIA char device drivers.
 #
 
-O_TARGET := pcmcia_char.o
-
 obj-$(CONFIG_PCMCIA_SERIAL_CS) += serial_cs.o
 obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
 

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 69d9bc3794ea8e6bbb66ad06f6d143d128b643d2..688cca9800d30f641beebe1d2e80ce5a50a4a985 100644 (file)
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -19,11 +19,7 @@ obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o
 obj-$(CONFIG_INPUT_JOYDEV)     += joydev.o
 obj-$(CONFIG_INPUT_EVDEV)      += evdev.o
 
-subdir-$(CONFIG_INPUT_JOYSTICK)        += joystick
-
-ifeq ($(CONFIG_INPUT_JOYSTICK),y)
-       obj-y += joystick/joydrv.o
-endif
+obj-$(CONFIG_INPUT_JOYSTICK)   += joystick/
 
 # The global Rules.make.
 

diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
index 8b2cdd21e1581b0e2fed8c92ce11b1b973cdd27e..c70244633703b24061ea6b8abfc0a01e450e44f6 100644 (file)
--- a/drivers/input/joystick/Makefile
+++ b/drivers/input/joystick/Makefile
@@ -2,10 +2,6 @@
 # Makefile for the input core drivers.
 #
 
-# The target object and module list name.
-
-O_TARGET       := joydrv.o
-
 # I-Force may need both USB and RS-232
 
 CONFIG_JOYSTICK_IFORCE := n

diff --git a/drivers/message/Makefile b/drivers/message/Makefile
index 3bb37d0dec3e6ef51415a098db213715c6bc4229..74d1b201f0522dd25d72a949b4bbc3f11c7d4228 100644 (file)
--- a/drivers/message/Makefile
+++ b/drivers/message/Makefile
@@ -6,15 +6,8 @@ O_TARGET := message.o
 
 mod-subdirs := i2o fusion 
 
-subdir-$(CONFIG_I2O)           += i2o
-ifeq ($(CONFIG_I2O),y)
-  obj-y += i2o/i2o.o
-endif
-
-subdir-$(CONFIG_FUSION)                += fusion
-ifeq ($(CONFIG_FUSION),y)
-  obj-y += fusion/fusion.o
-endif
+obj-$(CONFIG_I2O)      += i2o/
+obj-$(CONFIG_FUSION)   += fusion/
 
 include $(TOPDIR)/Rules.make
 

diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile
index 601a0cc2583f98f3fbaa72e6f1b0d92de2f28b1d..c5298d750522646c74a481ddacb9bf79a4e1ba16 100644 (file)
--- a/drivers/message/fusion/Makefile
+++ b/drivers/message/fusion/Makefile
@@ -43,8 +43,6 @@ EXTRA_CFLAGS += -I. ${MPT_CFLAGS}
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
 
-O_TARGET := fusion.o
-
 export-objs    := mptbase.o mptscsih.o mptlan.o mptctl.o isense.o
 
 obj-$(CONFIG_FUSION)           += mptbase.o mptscsih.o

diff --git a/drivers/message/i2o/Makefile b/drivers/message/i2o/Makefile
index 49fd7dcc3ad440dbc2364bf8cafb542babe6b182..44ca1bbcc8f7561a3dac77918e4ce0a92f8b1281 100644 (file)
--- a/drivers/message/i2o/Makefile
+++ b/drivers/message/i2o/Makefile
@@ -5,8 +5,6 @@
 # In the future, some of these should be built conditionally.
 #
 
-O_TARGET := i2o.o
-
 export-objs    := i2o_pci.o i2o_core.o i2o_config.o i2o_block.o i2o_lan.o i2o_scsi.o i2o_proc.o
 
 obj-$(CONFIG_I2O_PCI)  += i2o_pci.o

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index f842f658e2407be6d204faf016b3497725ee7012..383debd24e99d367d943c96e56afd68eaf7a17cd 100644 (file)
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -25,10 +25,8 @@ export-objs  := scsi_syms.o 53c700.o
 mod-subdirs    := pcmcia ../acorn/scsi
 
 
-subdir-$(CONFIG_SCSI_AIC7XXX)  += aic7xxx
 subdir-$(CONFIG_PCMCIA)                += pcmcia
 
-
 obj-$(CONFIG_SCSI)             += scsi_mod.o
 
 obj-$(CONFIG_A4000T_SCSI)      += amiga7xx.o   53c7xx.o
@@ -64,9 +62,7 @@ obj-$(CONFIG_SCSI_ULTRASTOR)  += ultrastor.o
 obj-$(CONFIG_SCSI_AHA152X)     += aha152x.o
 obj-$(CONFIG_SCSI_AHA1542)     += aha1542.o
 obj-$(CONFIG_SCSI_AHA1740)     += aha1740.o
-ifeq ($(CONFIG_SCSI_AIC7XXX),y)
-obj-$(CONFIG_SCSI_AIC7XXX)     += aic7xxx/aic7xxx_drv.o
-endif
+obj-$(CONFIG_SCSI_AIC7XXX)     += aic7xxx/
 obj-$(CONFIG_SCSI_AIC7XXX_OLD) += aic7xxx_old.o
 obj-$(CONFIG_SCSI_IPS)         += ips.o
 obj-$(CONFIG_SCSI_FD_MCS)      += fd_mcs.o
@@ -87,10 +83,7 @@ obj-$(CONFIG_SCSI_T128)              += t128.o
 obj-$(CONFIG_SCSI_DMX3191D)    += dmx3191d.o
 obj-$(CONFIG_SCSI_DTC3280)     += dtc.o
 obj-$(CONFIG_SCSI_NCR53C7xx)   += 53c7,8xx.o 
-subdir-$(CONFIG_SCSI_SYM53C8XX_2)      += sym53c8xx_2
-ifeq ($(CONFIG_SCSI_SYM53C8XX_2),y)
-  obj-$(CONFIG_SCSI_SYM53C8XX_2)       += sym53c8xx_2/sym53c8xx_2.o
-endif
+obj-$(CONFIG_SCSI_SYM53C8XX_2) += sym53c8xx_2/
 obj-$(CONFIG_SCSI_SYM53C8XX)   += sym53c8xx.o 
 obj-$(CONFIG_SCSI_NCR53C8XX)   += ncr53c8xx.o 
 obj-$(CONFIG_SCSI_EATA_DMA)    += eata_dma.o
@@ -123,8 +116,7 @@ obj-$(CONFIG_SCSI_FCAL)             += fcal.o
 obj-$(CONFIG_SCSI_CPQFCTS)     += cpqfc.o
 obj-$(CONFIG_SCSI_LASI700)     += lasi700.o 53c700.o
 
-subdir-$(CONFIG_ARCH_ACORN)    += ../acorn/scsi
-obj-$(CONFIG_ARCH_ACORN)       += ../acorn/scsi/acorn-scsi.o
+obj-$(CONFIG_ARCH_ACORN)       += ../acorn/scsi/
 
 obj-$(CONFIG_CHR_DEV_ST)       += st.o
 obj-$(CONFIG_CHR_DEV_OSST)     += osst.o

diff --git a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile
index 8c846e1eeea2c732b85fdcacbc19e2cc99559bc8..f6a898528cf0ae6f3a235b010d948e00a2933c48 100644 (file)
--- a/drivers/scsi/aic7xxx/Makefile
+++ b/drivers/scsi/aic7xxx/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the Linux aic7xxx SCSI driver.
 #
 
-O_TARGET := aic7xxx_drv.o
-
 obj-$(CONFIG_SCSI_AIC7XXX)     += aic7xxx.o
 
 # Core files

diff --git a/drivers/scsi/sym53c8xx_2/Makefile b/drivers/scsi/sym53c8xx_2/Makefile
index 4475b78518879253c9aef9a259355137b15b7d67..3417dea52d835cbb32bf2da46380c69c7977c0ed 100644 (file)
--- a/drivers/scsi/sym53c8xx_2/Makefile
+++ b/drivers/scsi/sym53c8xx_2/Makefile
@@ -1,7 +1,5 @@
 # Makefile for the NCR/SYMBIOS/LSI 53C8XX PCI SCSI controllers driver.
 
-O_TARGET := sym53c8xx_2.o
-
 sym53c8xx-objs := sym_fw.o sym_glue.o sym_hipd.o sym_malloc.o sym_misc.o sym_nvram.o
 obj-$(CONFIG_SCSI_SYM53C8XX_2) := sym53c8xx.o