X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c181f4417ff2149239e33f5bb0742304b51d9914..aa196b361191e3498cd8b96f0669722a4742cca2:/package/iw/Makefile?ds=inline

diff --git a/package/iw/Makefile b/package/iw/Makefile
index 8fd64913b..ce3b4ec48 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -1,20 +1,20 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iw
-PKG_VERSION:=0.9.5
+PKG_VERSION:=0.9.17
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://wireless.kernel.org/download/iw/
-PKG_BUILD_DEPENDS:=mac80211 libnl
+PKG_MD5SUM:=427841093ac11c5cbc025a3e13aac139
+PKG_BUILD_DEPENDS:=mac80211
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,17 +23,30 @@ define Package/iw
   CATEGORY:=Network
   TITLE:=cfg80211 interface configuration utility
   URL:=http://wireless.kernel.org/en/users/Documentation/iw
-  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +libnl
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +libnl-tiny
 endef
 
 define Build/Configure
-	$(CP) $(PKG_BUILD_DIR)/defconfig $(PKG_BUILD_DIR)/.config
-	echo "#define IW_VERSION \"$(VERSION)\"" > $(PKG_BUILD_DIR)/version.h
+	echo "const char iw_version[] = \"$(PKG_VERSION)\";" > $(PKG_BUILD_DIR)/version.c
+	rm -f $(PKG_BUILD_DIR)/version.sh
+	touch $(PKG_BUILD_DIR)/version.sh
+	chmod +x $(PKG_BUILD_DIR)/version.sh
 endef
 
+TARGET_CPPFLAGS:= \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	-I$(STAGING_DIR)/usr/include/mac80211 \
+	$(TARGET_CPPFLAGS) \
+	-DCONFIG_LIBNL20 \
+	-D_GNU_SOURCE
+
 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl -I$(STAGING_DIR)/usr/include" \
-	LDFLAGS="-L$(STAGING_DIR)/usr/lib -lnl"
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	NL1FOUND="" NL2FOUND=Y \
+	NLLIBNAME="libnl-tiny" \
+	LIBS="-lm -lnl-tiny" \
+	V=1
 
 ifneq ($(CONFIG_LINUX_2_6),)
   define Package/iw/install