merge the control file and the .ipk file targets into one to prevent them from going...

[openwrt.git] / package / broadcom-wl / Makefile

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 5db45cd..5ce37ff 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,22 +1,21 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl

-PKG_VERSION:=4.150.10.5.2
-PKG_RELEASE:=1
-WLC_VERSION:=0.1
+PKG_VERSION:=4.150.10.5.3
+PKG_RELEASE:=6
+WLC_VERSION:=0.2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources

-PKG_MD5SUM:=904a808dd98da076814fb7cb4b66a695
+PKG_MD5SUM:=cc615fd49719eea8bce5b2a8813783f3

 
 WL_WEXT=1
 
 
 WL_WEXT=1
 


@@ -101,7 +100,6 @@ endef
 
 define Package/wl
 $(call Package/broadcom-wl/Default)
 
 define Package/wl
 $(call Package/broadcom-wl/Default)

-  DEPENDS+= +nvram

   TITLE:=Proprietary Broadcom wl driver config utility
 endef
 
   TITLE:=Proprietary Broadcom wl driver config utility
 endef
 


@@ -112,7 +110,6 @@ endef
 
 define Package/nas
 $(call Package/broadcom-wl/Default)
 
 define Package/nas
 $(call Package/broadcom-wl/Default)

-  DEPENDS+= +nvram 

   TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
 endef
 
   TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
 endef
 


@@ -151,17 +148,25 @@ define Build/Compile
                $(if $(WL_WEXT),WL_WEXT=1) \
                modules
 
                $(if $(WL_WEXT),WL_WEXT=1) \
                modules
 

+       # NVRAM stub
+       $(TARGET_CC) $(TARGET_CFLAGS) -c -o $(PKG_BUILD_DIR)/nvram/nvram_stub.o $(PKG_BUILD_DIR)/nvram/nvram_stub.c
+

        # Compile wlc
        $(MAKE) -C $(PKG_BUILD_DIR)/wlc \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                all
        # Compile wlc
        $(MAKE) -C $(PKG_BUILD_DIR)/wlc \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                all

+

        # Compile libshared
        $(MAKE) -C $(PKG_BUILD_DIR)/router/shared \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) -I. -I$(PKG_BUILD_DIR)/include -Dlinux=1" \
                all
        # Compile libshared
        $(MAKE) -C $(PKG_BUILD_DIR)/router/shared \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) -I. -I$(PKG_BUILD_DIR)/include -Dlinux=1" \
                all

-       $(TARGET_CC) -o $(PKG_BUILD_DIR)/nas $(PKG_BUILD_DIR)/nas_exe.o -L$(STAGING_DIR)/usr/lib -lnvram $(PKG_BUILD_DIR)/router/shared/libshared.a
+       $(TARGET_CC) -o $(PKG_BUILD_DIR)/nas \
+               $(PKG_BUILD_DIR)/nas_exe.o \
+               $(PKG_BUILD_DIR)/nvram/nvram_stub.o \
+               $(TARGET_LDFLAGS) \
+               $(PKG_BUILD_DIR)/router/shared/libshared.a

        $(TARGET_CC) -o $(PKG_BUILD_DIR)/wl $(PKG_BUILD_DIR)/wl_exe.o
 endef
 
        $(TARGET_CC) -o $(PKG_BUILD_DIR)/wl $(PKG_BUILD_DIR)/wl_exe.o
 endef