X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/20b6535f4815b9c3c20061c966bea0fd8c322213..714ae6c0531a8a69bee3cbd5075ae1a8731d8cb0:/target/linux/package/madwifi/Makefile

diff --git a/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile
index d0aabbe93..e89ec1d0f 100644
--- a/target/linux/package/madwifi/Makefile
+++ b/target/linux/package/madwifi/Makefile
@@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk
 include ../../rules.mk
 
 PKG_NAME:=madwifi-ng
-PKG_VERSION:=r1416-20060126
+PKG_VERSION:=r1456-20060225
 PKG_RELEASE:=1
-PKG_MD5SUM:=f308a0dbbb5d5497c0e09d86e8bde32c
+PKG_MD5SUM:=27ccc5ba2e463fd8bee6da74d717731d
 
 PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -24,13 +24,23 @@ ifeq ($(ARCH),i386)
 HAL_TARGET:=i386-elf
 endif
 
+BUS := PCI
+
 ifneq ($(BR2_LINUX_2_4_AR531X),)
 	BUS := AHB
-	bus := ahb
-else
-	BUS := PCI
-	bus := pci
 endif
+ifneq ($(BR2_LINUX_2_6_ARUBA),)
+	BUS := PCI AHB	# no suitable HAL for AHB yet.
+endif
+
+BUS_MODULES:=
+ifeq ($(findstring AHB,$(BUS)),AHB)
+BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
+endif
+ifeq ($(findstring PCI,$(BUS)),PCI)
+BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
+endif
+
 
 include $(TOPDIR)/package/rules.mk
 
@@ -39,8 +49,7 @@ $(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)+$(PKG_VERS
 $(PKG_BUILD_DIR)/.configured:
 	touch $@
 
-$(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
 		PATH="$(TARGET_PATH)" \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -48,8 +57,16 @@ $(PKG_BUILD_DIR)/.built:
 		TOOLPREFIX="$(KERNEL_CROSS)" \
 		TOOLPATH="$(KERNEL_CROSS)" \
 		KERNELPATH="$(LINUX_DIR)" \
-		BUS="$(BUS)" \
-		DOMULTI=1 all
+		DOMULTI=1
+
+
+$(PKG_BUILD_DIR)/.built:
+ifeq ($(findstring AHB,$(BUS)),AHB)
+	$(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" all
+endif
+ifeq ($(findstring PCI,$(BUS)),PCI)
+	$(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" all
+endif
 	$(RSTRIP) $(PKG_BUILD_DIR)/tools/madwifi_multi
 	touch $@
 
@@ -60,20 +77,20 @@ $(IPKG_KMOD_MADWIFI):
 	mkdir -p $(IDIR_KMOD_MADWIFI)/usr/sbin
 	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*.$(LINUX_KMOD_SUFFIX) \
+	$(CP)	$(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
 		$(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
-		$(PKG_BUILD_DIR)/ath/ath_$(bus).$(LINUX_KMOD_SUFFIX) \
+		$(BUS_MODULES) \
 		$(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
 		$(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
 		$(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
-	cp -fpR $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/
+	$(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/
 	$(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include/madwifi
-	cp -fpR $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/
+	$(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/
 	mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211
-	cp -fpR $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/
+	$(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h