brcm80211: simplify makefiles

This came up during my backporting work but it seems
perfectly appropriate for the kernel as well.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/Makefile b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
index cba19d839b77951e14db3fc01115c475a79b09eb..32464acccd90bdc1d38ed5033977e29776a81c64 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
@@ -21,7 +21,7 @@ ccflags-y := \
        -Idrivers/net/wireless/brcm80211/brcmsmac/phy \
        -Idrivers/net/wireless/brcm80211/include
 
-BRCMSMAC_OFILES := \
+brcmsmac-y := \
        mac80211_if.o \
        ucode_loader.o \
        ampdu.o \
@@ -43,11 +43,6 @@ BRCMSMAC_OFILES := \
        brcms_trace_events.o \
        debug.o
 
-ifdef CONFIG_BCMA_DRIVER_GPIO
-BRCMSMAC_OFILES += led.o
-endif
+brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
 
-MODULEPFX := brcmsmac
-
-obj-$(CONFIG_BRCMSMAC) += $(MODULEPFX).o
-$(MODULEPFX)-objs      = $(BRCMSMAC_OFILES)
+obj-$(CONFIG_BRCMSMAC) += brcmsmac.o

diff --git a/drivers/net/wireless/brcm80211/brcmutil/Makefile b/drivers/net/wireless/brcm80211/brcmutil/Makefile
index d7c44752b0b7a3cb1a8408b2ddf8bda87ceb35da..8a928184016afcd60a7f8955608db6ba1a4f232a 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmutil/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile
@@ -19,11 +19,5 @@ ccflags-y :=                         \
        -Idrivers/net/wireless/brcm80211/brcmutil \
        -Idrivers/net/wireless/brcm80211/include
 
-BRCMUTIL_OFILES := \
-       utils.o \
-       d11.o
-
-MODULEPFX := brcmutil
-
-obj-$(CONFIG_BRCMUTIL) += $(MODULEPFX).o
-$(MODULEPFX)-objs      = $(BRCMUTIL_OFILES)
+obj-$(CONFIG_BRCMUTIL) += brcmutil.o
+brcmutil-objs  = utils.o d11.o