use gcc 4.0.2 and deselect ppp by default for Aruba, use gcc 3.4.5 for the other...

[openwrt.git] / package / wireless-tools / Makefile

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 4d132b9..24e6f61 100644 (file)
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wireless-tools
-PKG_VERSION:=28.pre7
+PKG_VERSION:=28.pre13
 PKG_RELEASE:=1
-PKG_MD5SUM:=bf598d6ded79e9e6b9bc2dbeb8258f48
+PKG_MD5SUM:=eb2c01c2945df2682a9b3c75515fd389
 
 PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
 PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz
@@ -18,38 +18,38 @@ 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
+$(PKG_BUILD_DIR)/.configured:
        touch $@
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \
-               all iwmulticall
+               libiw.so.28 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
+               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/
+       $(CP) $(PKG_BUILD_DIR)/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/
+       $(CP) $(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:
+install-dev: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/{lib,include}
-       cp -a $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/
+       $(CP) $(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/
+       $(CP) $(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
+compile-targets: install-dev
+clean-targets: uninstall-dev