kbuild: Use standard multi-part object declaration in drivers/char/*

drivers/char/Makefile

@@ -150,13 +150,7 @@ obj-$(CONFIG_SPECIALIX) += specialix.o
 obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
 obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
 obj-$(CONFIG_SX) += sx.o generic_serial.o
-
-obj-$(CONFIG_RIO) += generic_serial.o
-subdir-$(CONFIG_RIO) += rio
-ifeq ($(CONFIG_RIO),y)
-  obj-y += rio/rio.o
-endif
-
+obj-$(CONFIG_RIO) += rio/ generic_serial.o
 obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o
 obj-$(CONFIG_SERIAL167) += serial167.o
 obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
@@ -223,10 +217,7 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
 obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
 
-subdir-$(CONFIG_MWAVE) += mwave
-ifeq ($(CONFIG_MWAVE),y)
-  obj-y += mwave/mwave.o
-endif
+obj-$(CONFIG_MWAVE) += mwave/
 
 subdir-$(CONFIG_AGP) += agp
 ifeq ($(CONFIG_AGP),y)

drivers/char/ftape/Makefile

@@ -25,20 +25,8 @@
 
 O_TARGET := ftape.o
 
-subdir-$(CONFIG_FTAPE) += lowlevel
-subdir-$(CONFIG_ZFTAPE) += zftape
-subdir-$(CONFIG_ZFT_COMPRESSOR) += compressor
-
-ifeq ($(CONFIG_FTAPE),y)
-  obj-y    += lowlevel/ftape.o
-endif
-
-ifeq ($(CONFIG_ZFTAPE),y)
-  obj-y   += zftape/zftape.o
-endif
-
-ifeq ($(CONFIG_ZFT_COMPRESSOR),y)
-  obj-y += compressor/zft-compressor.o
-endif
+obj-$(CONFIG_FTAPE)		+= lowlevel/
+obj-$(CONFIG_ZFTAPE)		+= zftape/
+obj-$(CONFIG_ZFT_COMPRESSOR)	+= compressor/
 
 include $(TOPDIR)/Rules.make

drivers/char/ftape/compressor/Makefile

@@ -24,11 +24,11 @@
 #      Linux.
 #
 
-O_TARGET := zft-compressor.o
+O_TARGET := built-in.o
 
-obj-y    = zftape-compress.o lzrw3.o
+obj-$(CONFIG_ZFT_COMPRESSOR) += zft-compressor.o
 
-obj-m    = $(O_TARGET)
+zft-compressor-objs := zftape-compress.o lzrw3.o
 
 CFLAGS_lzrw3.o	:= -O6 -funroll-all-loops
 

drivers/char/ftape/lowlevel/Makefile

@@ -23,28 +23,28 @@
 #      driver for Linux.
 #
 
-O_TARGET := ftape.o
+O_TARGET := built-in.o
 
 export-objs := ftape_syms.o
 
-obj-y     = ftape-init.o fdc-io.o fdc-isr.o \
+obj-$(CONFIG_FTAPE) += ftape.o
+
+ftape-objs := ftape-init.o fdc-io.o fdc-isr.o \
 	      ftape-bsm.o ftape-ctl.o ftape-read.o ftape-rw.o \
 	      ftape-write.o ftape-io.o ftape-calibr.o ftape-ecc.o fc-10.o \
 	      ftape-buffer.o ftape-format.o ftape_syms.o
 
-obj-$(CONFIG_FTAPE) += ftape-setup.o
+ifeq ($(CONFIG_FTAPE),y)
+ftape-objs += ftape-setup.o
+endif
 
 ifndef CONFIG_FT_NO_TRACE_AT_ALL
-obj-y   += ftape-tracing.o
+ftape-objs += ftape-tracing.o
 endif
 
-ifeq ($(CONFIG_PROC_FS),y)
 ifeq ($(CONFIG_FT_PROC_FS),y)
-obj-y += ftape-proc.o
+ftape-objs += ftape-proc.o
 endif
-endif
-
-obj-m  = $(O_TARGET)
 
 include $(TOPDIR)/Rules.make
 

drivers/char/ftape/zftape/Makefile

@@ -27,17 +27,17 @@
 # ZFT_OBSOLETE - enable the MTIOC_ZFTAPE_GETBLKSZ ioctl. You should
 #                leave this enabled for compatibility with taper.
 
-EXTRA_CFLAGS := -DZFT_OBSOLETE
-
-O_TARGET := zftape.o
+O_TARGET := built-in.o
 
 export-objs := zftape_syms.o
 
-obj-y    := zftape-rw.o zftape-ctl.o zftape-read.o \
+obj-$(CONFIG_ZFTAPE) += zftape.o
+
+zftape-objs := zftape-rw.o zftape-ctl.o zftape-read.o \
 	       zftape-write.o zftape-vtbl.o zftape-eof.o \
 	       zftape-init.o zftape-buffers.o zftape_syms.o
 
-obj-m    := $(O_TARGET)
+EXTRA_CFLAGS := -DZFT_OBSOLETE
 
 include $(TOPDIR)/Rules.make
 

drivers/char/mwave/Makefile

@@ -3,23 +3,17 @@
 #
 # See the README file in this directory for more info. <paulsch@us.ibm.com>
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now inherited from the
-# parent makes..
-#
 
-# To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
-EXTRA_CFLAGS += -DMW_TRACE
+O_TARGET := built-in.o
+
+obj-$(CONFIG_MWAVE) += mwave.o
+
+mwave-objs := mwavedd.o smapi.o tp3780i.o 3780i.o
 
 # To have the mwave driver disable other uarts if necessary
 # EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES
 
-O_TARGET := mwave.o
-
-obj-y	:= mwavedd.o smapi.o tp3780i.o 3780i.o
-obj-m	:= $(O_TARGET)
+# To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
+EXTRA_CFLAGS += -DMW_TRACE
 
 include $(TOPDIR)/Rules.make

drivers/char/rio/Makefile

@@ -5,17 +5,12 @@
 # 
 # This file is GPL. See other files for the full Blurb. I'm lazy today. 
 #
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
 
-O_TARGET := rio.o
+O_TARGET := built-in.o
+
+obj-$(CONFIG_RIO) += rio.o
 
-obj-y   := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \
+rio-objs := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \
             rioparam.o riopcicopy.o rioroute.o riotable.o riotty.o
-obj-m   := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make