X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fiw%2FMakefile;h=2b714f8f9897a9bc17638d0a1999887dc46ecc65;hp=8fd64913b489b84cbc2255d9427820d253024611;hb=472a5fc774a367aa1c7bbac8107493f4e2c2a111;hpb=c181f4417ff2149239e33f5bb0742304b51d9914 diff --git a/package/iw/Makefile b/package/iw/Makefile index 8fd64913b..2b714f8f9 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -1,20 +1,20 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2011 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_RELEASE:=1 +PKG_VERSION:=0.9.22 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://wireless.kernel.org/download/iw/ -PKG_BUILD_DEPENDS:=mac80211 libnl +PKG_MD5SUM:=561c2602c5ce7c65a590118286c0892a +PKG_BUILD_DEPENDS:=mac80211 include $(INCLUDE_DIR)/package.mk @@ -23,23 +23,34 @@ 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 - $(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 -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" +TARGET_CPPFLAGS:= \ + -I$(STAGING_DIR)/usr/include/libnl-tiny \ + -I$(STAGING_DIR)/usr/include/mac80211 \ + $(TARGET_CPPFLAGS) \ + -DCONFIG_LIBNL20 \ + -D_GNU_SOURCE -ifneq ($(CONFIG_LINUX_2_6),) - define Package/iw/install +MAKE_FLAGS += \ + CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + NL1FOUND="" NL2FOUND=Y \ + NLLIBNAME="libnl-tiny" \ + LIBS="-lm -lnl-tiny" \ + V=1 + +define Package/iw/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/iw $(1)/usr/sbin/ - endef -endif +endef $(eval $(call BuildPackage,iw))