[package] base-files: Remove redundant stopping of watchdog

[openwrt.git] / package / iw / Makefile

diff --git a/package/iw/Makefile b/package/iw/Makefile
index 6db4bdb..226e8ca 100644 (file)
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -4,18 +4,17 @@
 # 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.10
+PKG_VERSION:=0.9.19
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://wireless.kernel.org/download/iw/
-PKG_MD5SUM:=c820116546768611bb7dd467c2b78483
-PKG_BUILD_DEPENDS:=mac80211 libnl
+PKG_MD5SUM:=3b88743f9c6ce8a7e2f5fd7d18fdea42
+PKG_BUILD_DEPENDS:=mac80211
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,16 +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:= +libnl-tiny @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
 endef
 
 define Build/Configure
-       echo "#define IW_VERSION \"$(PKG_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 $(TARGET_CPPFLAGS)" \
-       LDFLAGS="$(TARGET_LDFLAGS) -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