X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bcf459355067cbcf9f65ecc45ad991f8cbaa0c72..79409904b2e5757c66b3ed07091aeb259f3240db:/target/linux/package/madwifi/Makefile?ds=inline

diff --git a/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile
index 18aeba38e..2f573d66f 100644
--- a/target/linux/package/madwifi/Makefile
+++ b/target/linux/package/madwifi/Makefile
@@ -28,15 +28,9 @@ ifeq ($(ARCH),i386)
 HAL_TARGET:=i386-elf
 endif
 
-ifeq ($(KERNEL),2.4)
-MODUL_SUFFIX=o
-else
-MODUL_SUFFIX=ko
-endif
-
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE))))
+$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE))))
 
 $(PKG_BUILD_DIR)/.configured:
 	touch $@
@@ -45,9 +39,11 @@ $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		PATH="$(TARGET_PATH)" \
 		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		TARGET="$(HAL_TARGET)" \
 		TOOLPREFIX="$(KERNEL_CROSS)" \
-		KERNELPATH="$(KERNEL_DIR)"
+		KERNELPATH="$(KERNEL_DIR)" \
+		all
 	touch $@
 
 $(IPKG_KMOD_MADWIFI):
@@ -56,10 +52,10 @@ $(IPKG_KMOD_MADWIFI):
 	mkdir -p $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)
 	install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi
 	install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
-	cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(MODUL_SUFFIX) \
-		$(PKG_BUILD_DIR)/ath_hal/ath_hal.$(MODUL_SUFFIX) \
-		$(PKG_BUILD_DIR)/ath_rate/onoe/ath_rate_onoe.$(MODUL_SUFFIX) \
-		$(PKG_BUILD_DIR)/ath/ath_pci.$(MODUL_SUFFIX) \
+	cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
+		$(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
+		$(PKG_BUILD_DIR)/ath_rate/onoe/ath_rate_onoe.$(LINUX_KMOD_SUFFIX) \
+		$(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) \
 		$(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
 	$(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)