5 files changed, 31 insertions, 59 deletions
diff --git a/package/Config.in b/package/Config.in
index fe9693933..6b3616ab4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -435,7 +435,7 @@ source "package/webif/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/wget/Config.in"
 endif
-source "package/wireless-tools/Config.in"
+source "package/wireless_tools/Config.in"
 source "package/wpa_supplicant/Config.in"
 
 endmenu
diff --git a/package/wireless-tools/wireless-tools.mk b/package/wireless-tools/wireless-tools.mk
deleted file mode 100644
index 9c16ff8ec..000000000
--- a/package/wireless-tools/wireless-tools.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#############################################################
-#
-# wireless-tools - Wireless Tools
-#
-#############################################################
-
-# This Makefile only work with the multicall version of Wireless Tools,
-# which is available in 28-pre3 and later...
-# Jean II
-# v28.pre3 -> earliest possible
-WIRELESS_TOOLS_VERSION:=29
-WIRELESS_TOOLS_SUBVER:=
-
-WIRELESS_TOOLS_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-WIRELESS_TOOLS_SOURCE:=wireless_tools.$(WIRELESS_TOOLS_VERSION)$(WIRELESS_TOOLS_SUBVER).tar.gz
-WIRELESS_TOOLS_BUILD_DIR=$(BUILD_DIR)/wireless_tools.$(WIRELESS_TOOLS_VERSION)
-
-$(DL_DIR)/$(WIRELESS_TOOLS_SOURCE):
-	 $(call DOWNLOAD,$(WIRELESS_TOOLS_SOURCE_URL),$(WIRELESS_TOOLS_SOURCE))
-
-$(WIRELESS_TOOLS_BUILD_DIR)/.unpacked: $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE)
-	$(ZCAT) $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(WIRELESS_TOOLS_BUILD_DIR) package/wireless-tools/ \*.patch
-	sed -i -e s:'strip':'$(STRIPCMD)':g $(WIRELESS_TOOLS_BUILD_DIR)/Makefile
-	touch $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked
-
-$(WIRELESS_TOOLS_BUILD_DIR)/.configured: $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked
-	touch $(WIRELESS_TOOLS_BUILD_DIR)/.configured
-
-$(WIRELESS_TOOLS_BUILD_DIR)/iwmulticall: $(WIRELESS_TOOLS_BUILD_DIR)/.configured
-	$(MAKE) -C $(WIRELESS_TOOLS_BUILD_DIR) \
-		CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
-		iwmulticall
-
-$(TARGET_DIR)/sbin/iwconfig: $(WIRELESS_TOOLS_BUILD_DIR)/iwmulticall
-	$(MAKE) -C $(WIRELESS_TOOLS_BUILD_DIR) \
-		PREFIX="$(TARGET_DIR)" \
-		CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
-		install-iwmulticall
-
-wireless-tools: $(TARGET_DIR)/sbin/iwconfig
-
-wireless-tools-source: $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE)
-
-wireless-tools-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(WIRELESS_TOOLS_BUILD_DIR) uninstall
-	-$(MAKE) -C $(WIRELESS_TOOLS_BUILD_DIR) clean
-
-wireless-tools-dirclean:
-	rm -rf $(WIRELESS_TOOLS_BUILD_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
-TARGETS+=wireless-tools
-endif
diff --git a/package/wireless-tools/Config.in b/package/wireless_tools/Config.in
index efe28d288..efe28d288 100644
--- a/package/wireless-tools/Config.in
+++ b/package/wireless_tools/Config.in
diff --git a/package/wireless-tools/wireless_tools.29-remove-bzero.patch b/package/wireless_tools/wireless_tools-29-remove-bzero.patch
index 4714b317b..4714b317b 100644
--- a/package/wireless-tools/wireless_tools.29-remove-bzero.patch
+++ b/package/wireless_tools/wireless_tools-29-remove-bzero.patch
diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk
new file mode 100644
index 000000000..0707808f2
--- /dev/null
+++ b/package/wireless_tools/wireless_tools.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# wireless_tools
+#
+#############################################################
+
+WIRELESS_TOOLS_VERSION = 29
+WIRELESS_TOOLS_SITE = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
+WIRELESS_TOOLS_SOURCE = wireless_tools.$(WIRELESS_TOOLS_VERSION).tar.gz
+
+define WIRELESS_TOOLS_BUILD_CMDS
+	$(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+		iwmulticall
+endef
+
+define WIRELESS_TOOLS_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+	rm -f $(@D)/iwmulticall
+endef
+
+define WIRELESS_TOOLS_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" install-iwmulticall
+	$(MAKE) -C $(@D) INSTALL_MAN="$(TARGET_DIR)/usr/share/man" install-man
+endef
+
+define WIRELESS_TOOLS_UNINSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" uninstall
+endef
+
+$(eval $(call GENTARGETS,package,wireless_tools))