install libshared into the staging dir (required by wrt-radauth)

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

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 0c977d1801b86a58959a0dcf1855d106f61f816c..5db45cdba0beda92701db156a1bfb7dbe884c139 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
-PKG_VERSION:=4.150.10.5.1
+PKG_VERSION:=4.150.10.5.2
 PKG_RELEASE:=1
 WLC_VERSION:=0.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=13cffebdcc08ef87673fbc02b2d56d52
+PKG_MD5SUM:=904a808dd98da076814fb7cb4b66a695
 
 WL_WEXT=1
 
@@ -101,6 +101,7 @@ endef
 
 define Package/wl
 $(call Package/broadcom-wl/Default)
+  DEPENDS+= +nvram
   TITLE:=Proprietary Broadcom wl driver config utility
 endef
 
@@ -111,7 +112,7 @@ endef
 
 define Package/nas
 $(call Package/broadcom-wl/Default)
-  DEPENDS+= +nvram
+  DEPENDS+= +nvram 
   TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
 endef
 
@@ -155,10 +156,20 @@ define Build/Compile
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                all
-       $(TARGET_CC) -o $(PKG_BUILD_DIR)/nas $(PKG_BUILD_DIR)/nas_exe.o -L$(STAGING_DIR)/usr/lib -lnvram
+       # 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)/wl $(PKG_BUILD_DIR)/wl_exe.o
 endef
 
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/router/shared/libshared.a $(1)/usr/lib/
+endef
+
 define Package/wlc/install
        $(CP) ./files/* $(1)/
        $(INSTALL_DIR) $(1)/sbin