more V= fixes

[openwrt.git] / openwrt / target / linux / package / madwifi / Makefile

diff --git a/openwrt/target/linux/package/madwifi/Makefile b/openwrt/target/linux/package/madwifi/Makefile
index bde33e2..2f06a22 100644 (file)
--- a/openwrt/target/linux/package/madwifi/Makefile
+++ b/openwrt/target/linux/package/madwifi/Makefile
@@ -1,13 +1,14 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include ../../rules.mk
 
 PKG_NAME:=madwifi
-PKG_VERSION:=2005-08-13
+PKG_VERSION:=2005-09-16
 PKG_RELEASE:=1
-PKG_MD5SUM:=188127127aebd8815595c025a787d729
+PKG_MD5SUM:=af6959c971ffa1b38ec171833834b845
 
-PKG_SOURCE_URL:=http://madwifi.otaku42.de/2005/08/
+PKG_SOURCE_URL:=http://madwifi.otaku42.de/2005/09/
 PKG_SOURCE:=$(PKG_NAME)-cvs-snapshot-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
@@ -27,6 +28,12 @@ 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))))
@@ -36,7 +43,8 @@ $(PKG_BUILD_DIR)/.configured:
 
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               ARCH="$(ARCH)" \
+               PATH="$(TARGET_PATH)" \
+               ARCH="$(LINUX_KARCH)" \
                TARGET="$(HAL_TARGET)" \
                TOOLPREFIX="$(KERNEL_CROSS)" \
                KERNELPATH="$(KERNEL_DIR)"
@@ -48,10 +56,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*.o \
-               $(PKG_BUILD_DIR)/ath_hal/ath_hal.o \
-               $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.o \
-               $(PKG_BUILD_DIR)/ath/ath_pci.o \
+       cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(MODUL_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(MODUL_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(MODUL_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath/ath_pci.$(MODUL_SUFFIX) \
                $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)
 
@@ -67,5 +75,5 @@ install-dev: $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h
 uninstall-dev:
        rm -rf $(STAGING_DIR)/usr/include/madwifi
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev