From 9ae811d9a0d343d9ea66a8ad4c3666f0d9efdb51 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 30 Apr 2009 14:53:01 +0000
Subject: crda: use libnl-tiny

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15516 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/crda/Makefile | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'package/crda/Makefile')

diff --git a/package/crda/Makefile b/package/crda/Makefile
index e134c39e3..658511705 100644
--- a/package/crda/Makefile
+++ b/package/crda/Makefile
@@ -14,7 +14,7 @@ PKG_VERSION:=1.0.2
 PKG_SOURCE_URL:=http://wireless.kernel.org/download/crda
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=1f9854a77c7d92671b8bc8a502716a5b
-PKG_BUILD_DEPENDS:=mac80211 libnl
+PKG_BUILD_DEPENDS:=mac80211
 
 PKG_REGULATORY_NAME:=regulatory
 PKG_REGULATORY_VERSION:=2009.04.17
@@ -28,7 +28,7 @@ define Package/crda
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Central Regulatory Domain Agent (CRDA)
-  DEPENDS:=@LINUX_2_6 +hotplug2 +kmod-mac80211
+  DEPENDS:=@LINUX_2_6 +hotplug2 +kmod-mac80211 +libnl-tiny
   URL:=http://wireless.kernel.org/en/developers/Regulatory/CRDA
 endef
 
@@ -49,14 +49,16 @@ define Package/crda/description
  yet to be added).
 endef
 
-define Build/Compile
-	$(MAKE_VARS) \
-	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
-		$(MAKE_FLAGS) \
-		NLLIBS="$(STAGING_DIR)/usr/lib/libnl.a -lm" \
-		REG_BIN="$(DL_DIR)/$(PKG_REGULATORY_SOURCE)" \
-		crda
-endef
+TARGET_CPPFLAGS := \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	$(TARGET_CPPFLAGS)
+
+MAKE_FLAGS += \
+	NL1FOUND="" NL2FOUND=Y \
+	NLLIBNAME="libnl-tiny" \
+	NLLIBS="-lnl-tiny -lm" \
+	REG_BIN="$(DL_DIR)/$(PKG_REGULATORY_SOURCE)" \
+	crda
 
 define Package/crda/install
 	$(INSTALL_DIR) $(1)/sbin
-- 
cgit v1.2.3