From b4c2371ebb2af4f08a7928bba82a3c3f77989f3e Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 30 Aug 2007 15:38:15 +0000 Subject: rt2x00 fixes (thanks to sn9): * make build depends on in-kernel mac80211 support * rework kconfig handling * download firmware images into $(DL_DIR) * tweak source Makefile git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8548 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/rt2x00/src/Makefile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'package/rt2x00/src/Makefile') diff --git a/package/rt2x00/src/Makefile b/package/rt2x00/src/Makefile index 84352c396..dd32cf6a2 100644 --- a/package/rt2x00/src/Makefile +++ b/package/rt2x00/src/Makefile @@ -38,25 +38,28 @@ else KERNEL_OUTPUT := endif -# -# Include kernel and rt2x00 config. -# -include $(KERNEL_SOURCES)/.config -include $(SUBDIRS)/config - # # Determine if and with what options the rt2x00 drivers should be build # rt2x00lib-objs := rt2x00dev.o rt2x00mac.o ifeq ($(CONFIG_RT2X00),y) + obj-m += rt2x00lib.o + +ifneq ($(CONFIG_PCI),) + obj-m += rt2x00pci.o +endif + +ifneq ($(CONFIG_USB),) + obj-m += rt2x00usb.o +endif ifeq ($(CONFIG_RT2X00_LIB_DEBUGFS),y) rt2x00lib-objs += rt2x00debug.o endif ifeq ($(CONFIG_RT2400PCI),y) - obj-m += rt2400pci.o rt2x00pci.o rt2x00lib.o + obj-m += rt2400pci.o ifeq ($(CONFIG_RT2400PCI_RFKILL),y) rt2x00lib-objs += rt2x00rfkill.o CFLAGS += -DCONFIG_RT2X00_LIB_RFKILL @@ -64,7 +67,7 @@ endif endif ifeq ($(CONFIG_RT2500PCI),y) - obj-m += rt2500pci.o rt2x00pci.o rt2x00lib.o + obj-m += rt2500pci.o ifeq ($(CONFIG_RT2500PCI_RFKILL),y) rt2x00lib-objs += rt2x00rfkill.o CFLAGS += -DCONFIG_RT2X00_LIB_RFKILL @@ -72,13 +75,13 @@ endif endif ifeq ($(CONFIG_RT2500USB),y) - obj-m += rt2500usb.o rt2x00usb.o rt2x00lib.o + obj-m += rt2500usb.o endif ifeq ($(CONFIG_RT61PCI),y) CFLAGS += -DCONFIG_RT2X00_LIB_FIRMWARE rt2x00lib-objs += rt2x00firmware.o - obj-m += rt61pci.o rt2x00pci.o rt2x00lib.o + obj-m += rt61pci.o ifeq ($(CONFIG_RT61PCI_RFKILL),y) rt2x00lib-objs += rt2x00rfkill.o CFLAGS += -DCONFIG_RT2X00_LIB_RFKILL @@ -88,13 +91,12 @@ endif ifeq ($(CONFIG_RT73USB),y) CFLAGS += -DCONFIG_RT2X00_LIB_FIRMWARE rt2x00lib-objs += rt2x00firmware.o - obj-m += rt73usb.o rt2x00usb.o rt2x00lib.o + obj-m += rt73usb.o endif endif MAKEFLAGS += --no-print-directory -CFLAGS := -include $(SUBDIRS)/rt2x00_compat.h $(CFLAGS) all: default -- cgit v1.2.3