X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/796a9d1091884a07817e5c140d0ff6a0b8c76235..5a76cd437c8b0271c03ade8ad07335b2e8f590a3:/package/broadcom-wl/Makefile diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index e8aea7496..5ce37ff31 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -10,8 +10,8 @@ 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 @@ -100,7 +100,6 @@ endef define Package/wl $(call Package/broadcom-wl/Default) - DEPENDS+= +nvram TITLE:=Proprietary Broadcom wl driver config utility endef @@ -111,7 +110,6 @@ endef define Package/nas $(call Package/broadcom-wl/Default) - DEPENDS+= +nvram TITLE:=Proprietary Broadcom WPA/WPA2 authenticator endef @@ -150,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 $(TARGET_LDFLAGS) -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