X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b32a0ceff198e0bf11b5cecff155fc5f7e2443f3..d002d70af78bd86328f64c9078799808de84fd6e:/openwrt/package/wireless-tools/Makefile?ds=sidebyside

diff --git a/openwrt/package/wireless-tools/Makefile b/openwrt/package/wireless-tools/Makefile
index df251625b..4d132b99d 100644
--- a/openwrt/package/wireless-tools/Makefile
+++ b/openwrt/package/wireless-tools/Makefile
@@ -3,52 +3,53 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wireless-tools
-PKG_VERSION:=27
+PKG_VERSION:=28.pre7
 PKG_RELEASE:=1
-PKG_MD5SUM:=29891b66f23565e7e381d28404abb29a
+PKG_MD5SUM:=bf598d6ded79e9e6b9bc2dbeb8258f48
 
-PKG_SOURCE_URL:=http://pcmcia-cs.sourceforge.net/ftp/contrib/
+PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
 PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.$(PKG_VERSION)
 PKG_CAT:=zcat
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
-
-$(DL_DIR)/$(PKG_SOURCE):
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
-
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	touch $(PKG_BUILD_DIR)/.patched
-
-$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched
-	$(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." -C $(PKG_BUILD_DIR)
-
-$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_IPK_DIR)/usr/lib
-	mkdir -p $(PKG_IPK_DIR)/usr/sbin
-	cp $(PKG_BUILD_DIR)/libiw.so.27 $(PKG_IPK_DIR)/usr/lib
-	cp $(PKG_BUILD_DIR)/iwconfig $(PKG_IPK_DIR)/usr/sbin
-	cp $(PKG_BUILD_DIR)/ifrename $(PKG_IPK_DIR)/usr/sbin
-	cp $(PKG_BUILD_DIR)/iwlist $(PKG_IPK_DIR)/usr/sbin
-	cp $(PKG_BUILD_DIR)/iwspy $(PKG_IPK_DIR)/usr/sbin
-	cp $(PKG_BUILD_DIR)/iwpriv $(PKG_IPK_DIR)/usr/sbin
-	cp $(PKG_BUILD_DIR)/iwevent $(PKG_IPK_DIR)/usr/sbin
-	cp $(PKG_BUILD_DIR)/iwgetid $(PKG_IPK_DIR)/usr/sbin
-	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
-	mkdir -p $(PACKAGE_DIR)
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+	touch $@
+
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \
+		all iwmulticall
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		PREFIX="$(PKG_INSTALL_DIR)" \
+		INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \
+		INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \
+		install install-iwmulticall
+	touch $@
+
+$(IPKG_WIRELESS_TOOLS):
+	mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/
+	mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/
+	$(RSTRIP) $(IDIR_WIRELESS_TOOLS)
+	$(IPKG_BUILD) $(IDIR_WIRELESS_TOOLS) $(PACKAGE_DIR)
+
+install-dev:
+	mkdir -p $(STAGING_DIR)/usr/{lib,include}
+	cp -a $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/
+	ln -sf libiw.so.28 $(STAGING_DIR)/usr/lib/libiw.so
+	cp -a $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/
+	
+uninstall-dev:
+	rm -f $(STAGING_DIR)/usr/lib/libiw.*
+	rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h
+
+compile: install-dev
+clean: uninstall-dev