* [PATCH] brcm80211: simplify makefiles
@ 2013-04-11 14:15 Johannes Berg
2013-04-11 15:14 ` Arend van Spriel
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2013-04-11 14:15 UTC (permalink / raw)
To: linux-wireless; +Cc: arend, brcm80211-dev-list, Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
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>
---
drivers/net/wireless/brcm80211/brcmsmac/Makefile | 11 +++--------
drivers/net/wireless/brcm80211/brcmutil/Makefile | 9 ++-------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/Makefile b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
index cba19d8..32464ac 100644
--- 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 6281c41..8bf7500 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile
@@ -19,10 +19,5 @@ ccflags-y := \
-Idrivers/net/wireless/brcm80211/brcmutil \
-Idrivers/net/wireless/brcm80211/include
-BRCMUTIL_OFILES := \
- utils.o
-
-MODULEPFX := brcmutil
-
-obj-$(CONFIG_BRCMUTIL) += $(MODULEPFX).o
-$(MODULEPFX)-objs = $(BRCMUTIL_OFILES)
+obj-$(CONFIG_BRCMUTIL) += brcmutil.o
+brcmutil-objs = utils.o
--
1.8.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] brcm80211: simplify makefiles
2013-04-11 14:15 [PATCH] brcm80211: simplify makefiles Johannes Berg
@ 2013-04-11 15:14 ` Arend van Spriel
0 siblings, 0 replies; 2+ messages in thread
From: Arend van Spriel @ 2013-04-11 15:14 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, brcm80211-dev-list, Johannes Berg
On 04/11/2013 04:15 PM, Johannes Berg wrote:
> From: Johannes Berg<johannes.berg@intel.com>
>
> This came up during my backporting work but it seems
> perfectly appropriate for the kernel as well.
Acked-by: Arend van Spriel <arend@broadcom.com>
> Signed-off-by: Johannes Berg<johannes.berg@intel.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-11 15:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-11 14:15 [PATCH] brcm80211: simplify makefiles Johannes Berg
2013-04-11 15:14 ` Arend van Spriel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).