rt2x00: Cleanup Makefile

Simplify the way rt2x00 assigns new objects to the
rt2x00lib module. This saves a few if statements
and overall does this looks much nicer.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 16 insertions, 25 deletions

diff --git a/drivers/net/wireless/rt2x00/Makefile b/drivers/net/wireless/rt2x00/Makefile
index 757bbc077d93..1087dbcf1a04 100644
--- a/drivers/net/wireless/rt2x00/Makefile
+++ b/drivers/net/wireless/rt2x00/Makefile
@@ -1,26 +1,17 @@
-rt2x00lib-objs := rt2x00dev.o rt2x00mac.o rt2x00config.o rt2x00queue.o
+rt2x00lib-y                             += rt2x00dev.o
+rt2x00lib-y                             += rt2x00mac.o
+rt2x00lib-y                             += rt2x00config.o
+rt2x00lib-y                             += rt2x00queue.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_DEBUGFS)  += rt2x00debug.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_RFKILL)   += rt2x00rfkill.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_FIRMWARE) += rt2x00firmware.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_LEDS)     += rt2x00leds.o
 
-ifeq ($(CONFIG_RT2X00_LIB_DEBUGFS),y)
-        rt2x00lib-objs += rt2x00debug.o
-endif
-
-ifeq ($(CONFIG_RT2X00_LIB_RFKILL),y)
-        rt2x00lib-objs += rt2x00rfkill.o
-endif
-
-ifeq ($(CONFIG_RT2X00_LIB_FIRMWARE),y)
-        rt2x00lib-objs += rt2x00firmware.o
-endif
-
-ifeq ($(CONFIG_RT2X00_LIB_LEDS),y)
-        rt2x00lib-objs += rt2x00leds.o
-endif
-
-obj-$(CONFIG_RT2X00_LIB)        += rt2x00lib.o
-obj-$(CONFIG_RT2X00_LIB_PCI)    += rt2x00pci.o
-obj-$(CONFIG_RT2X00_LIB_USB)    += rt2x00usb.o
-obj-$(CONFIG_RT2400PCI)         += rt2400pci.o
-obj-$(CONFIG_RT2500PCI)         += rt2500pci.o
-obj-$(CONFIG_RT61PCI)           += rt61pci.o
-obj-$(CONFIG_RT2500USB)         += rt2500usb.o
-obj-$(CONFIG_RT73USB)           += rt73usb.o
+obj-$(CONFIG_RT2X00_LIB)                += rt2x00lib.o
+obj-$(CONFIG_RT2X00_LIB_PCI)            += rt2x00pci.o
+obj-$(CONFIG_RT2X00_LIB_USB)            += rt2x00usb.o
+obj-$(CONFIG_RT2400PCI)                 += rt2400pci.o
+obj-$(CONFIG_RT2500PCI)                 += rt2500pci.o
+obj-$(CONFIG_RT61PCI)                   += rt61pci.o
+obj-$(CONFIG_RT2500USB)                 += rt2500usb.o
+obj-$(CONFIG_RT73USB)                   += rt73usb.o