X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8451dc8595449824720752b2cba13651f45e541a..85545a1d5a01821af290e54c7efbfc05d5a1d6f7:/package/broadcom-wl/Makefile?ds=inline diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index e49fc50a8..5ce37ff31 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -4,15 +4,14 @@ # 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 PKG_VERSION:=4.150.10.5.3 -PKG_RELEASE:=2 -WLC_VERSION:=0.1 +PKG_RELEASE:=6 +WLC_VERSION:=0.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources @@ -101,7 +100,6 @@ endef define Package/wl $(call Package/broadcom-wl/Default) - DEPENDS+= +nvram TITLE:=Proprietary Broadcom wl driver config utility endef @@ -112,7 +110,6 @@ endef define Package/nas $(call Package/broadcom-wl/Default) - DEPENDS+= +nvram TITLE:=Proprietary Broadcom WPA/WPA2 authenticator endef @@ -151,17 +148,25 @@ define Build/Compile $(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 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