[wireless] version bump to 30.pre8, fix install stage

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10222 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 34 insertions, 64 deletions

diff --git a/rules/wireless.make b/rules/wireless.make
index ae4086d8e..1dba59932 100644
--- a/rules/wireless.make
+++ b/rules/wireless.make
@@ -2,6 +2,8 @@
 # $Id$
 #
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
+#               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -16,119 +18,87 @@ PACKAGES-$(PTXCONF_WIRELESS) += wireless
 #
 # Paths and names
 #
-WIRELESS_VERSION	= 30.pre7
-WIRELESS		= wireless_tools.$(WIRELESS_VERSION)
-WIRELESS_SUFFIX		= tar.gz
-WIRELESS_URL		= http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$(WIRELESS).$(WIRELESS_SUFFIX) \
-			  http://pcmcia-cs.sourceforge.net/ftp/contrib/$(WIRELESS).$(WIRELESS_SUFFIX)
-WIRELESS_SOURCE		= $(SRCDIR)/$(WIRELESS).$(WIRELESS_SUFFIX)
-WIRELESS_DIR 		= $(BUILDDIR)/$(WIRELESS)
-
+WIRELESS_VERSION	:= 30
+WIRELESS_VERSION_PRE	:= pre8
+WIRELESS		:= wireless_tools.$(WIRELESS_VERSION).$(WIRELESS_VERSION_PRE)
+WIRELESS_SUFFIX		:= tar.gz
+WIRELESS_URL		:= http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$(WIRELESS).$(WIRELESS_SUFFIX)
+WIRELESS_SOURCE		:= $(SRCDIR)/$(WIRELESS).$(WIRELESS_SUFFIX)
+WIRELESS_DIR 		:= $(BUILDDIR)/wireless_tools.$(WIRELESS_VERSION)
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-wireless_get: $(STATEDIR)/wireless.get
-
-$(STATEDIR)/wireless.get: $(wireless_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(WIRELESS_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, WIRELESS)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-wireless_extract: $(STATEDIR)/wireless.extract
-
-$(STATEDIR)/wireless.extract: $(wireless_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(WIRELESS_DIR))
-	@$(call extract, WIRELESS)
-	# FIXME: move the pre version
-	mv $(BUILDDIR)/wireless_tools.30 $(WIRELESS_DIR)
-	@$(call patchin, WIRELESS)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-wireless_prepare: $(STATEDIR)/wireless.prepare
-
-$(STATEDIR)/wireless.prepare: $(wireless_prepare_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/wireless.prepare:
+	@$(call targetinfo)
 ifdef PTXCONF_WIRELESS_SHARED
 	@$(call disable_sh,$(WIRELESS_DIR)/Makefile,BUILD_STATIC)
 else
 	@$(call enable_sh, $(WIRELESS_DIR)/Makefile,BUILD_STATIC)
 endif
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-WIRELESS_PATH	=  PATH=$(CROSS_PATH)
-WIRELESS_ENV 	=  $(CROSS_ENV)
+WIRELESS_PATH	:=  PATH=$(CROSS_PATH)
+WIRELESS_ENV 	:=  $(CROSS_ENV)
 
-wireless_compile: $(STATEDIR)/wireless.compile
-
-$(STATEDIR)/wireless.compile: $(wireless_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(WIRELESS_DIR) && $(WIRELESS_PATH) $(WIRELESS_ENV) \
-		make CC=${CROSS_CC} PREFIX=/usr
-	@$(call touch, $@)
+WIRELESS_MAKEVARS := \
+	CC=${CROSS_CC} \
+	PREFIX=/usr
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-wireless_install: $(STATEDIR)/wireless.install
-
-$(STATEDIR)/wireless.install: $(wireless_install_deps_default)
-	@$(call targetinfo, $@)
-	cd $(WIRELESS_DIR) && $(WIRELESS_PATH) $(WIRELESS_ENV) \
-		make install-hdr CC=${CROSS_CC} PREFIX=/usr
-	@$(call touch, $@)
+$(STATEDIR)/wireless.install:
+	@$(call targetinfo)
+	@$(call install, WIRELESS,,install-hdr)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-wireless_targetinstall: $(STATEDIR)/wireless.targetinstall
-
-$(STATEDIR)/wireless.targetinstall: $(wireless_targetinstall_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/wireless.targetinstall:
+	@$(call targetinfo)
 
 	@$(call install_init, wireless)
 	@$(call install_fixup, wireless,PACKAGE,wireless)
 	@$(call install_fixup, wireless,PRIORITY,optional)
 	@$(call install_fixup, wireless,VERSION,$(WIRELESS_VERSION))
 	@$(call install_fixup, wireless,SECTION,base)
-	@$(call install_fixup, wireless,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, wireless,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, wireless,DEPENDS,)
 	@$(call install_fixup, wireless,DESCRIPTION,missing)
 
-	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwconfig, /usr/sbin/iwconfig)
-	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwlist, /usr/sbin/iwlist)
-	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwpriv, /usr/sbin/iwpriv)
-	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwspy, /usr/sbin/iwspy)
-	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwgetid, /usr/sbin/iwgetid)
-	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwevent, /usr/sbin/iwevent)
+	@$(call install_copy, wireless, 0, 0, 0755, -, /usr/sbin/iwconfig)
+	@$(call install_copy, wireless, 0, 0, 0755, -, /usr/sbin/iwlist)
+	@$(call install_copy, wireless, 0, 0, 0755, -, /usr/sbin/iwpriv)
+	@$(call install_copy, wireless, 0, 0, 0755, -, /usr/sbin/iwspy)
+	@$(call install_copy, wireless, 0, 0, 0755, -, /usr/sbin/iwgetid)
+	@$(call install_copy, wireless, 0, 0, 0755, -, /usr/sbin/iwevent)
 
 ifdef PTXCONF_WIRELESS_SHARED
-	@$(call install_copy, wireless, 0, 0, 0644, $(WIRELESS_DIR)/libiw.so.$(WIRELESS_VERSION), \
+	@$(call install_copy, wireless, 0, 0, 0644, -, \
 		/usr/lib/libiw.so.$(WIRELESS_VERSION))
+	@$(call install_link, wireless, libiw.so.$(WIRELESS_VERSION), /usr/lib/libiw.so)
 endif
 
 	@$(call install_finish, wireless)
 
-	@$(call touch, $@)
+	@$(call touch)
 # ----------------------------------------------------------------------------
 # Clean
 # ----------------------------------------------------------------------------