From c2b3e370d6b98ef37d48582d55b26794ac2bf63f Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer
Date: Tue, 15 May 2007 09:33:32 +0000
Subject: - apply hunk that fixes an issue with (wrong?) dependencies. Initial
 notes were:   There is something wrong in the new buildsys: If one selects ip
 and has e.g.   rule or route unset, ip still wants to build those.   This
 fails (correctly) since rtnl_rttable_n2a and rtnl_rtrealm_n2a aren't  
 available if they were turned off. TODO: Talk to vda about this

---
 networking/libiproute/Kbuild | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'networking/libiproute/Kbuild')

diff --git a/networking/libiproute/Kbuild b/networking/libiproute/Kbuild
index 8383630..95d37e8 100644
--- a/networking/libiproute/Kbuild
+++ b/networking/libiproute/Kbuild
@@ -8,11 +8,6 @@
 lib-y:=
 lib-$(CONFIG_IP) += \
 	ip_parse_common_args.o \
-	ipaddress.o \
-	iplink.o \
-	iproute.o \
-	iptunnel.o \
-	iprule.o \
 	libnetlink.o \
 	ll_addr.o \
 	ll_map.o \
@@ -22,7 +17,7 @@ lib-$(CONFIG_IP) += \
 	rtm_map.o \
 	utils.o
 
-lib-$(CONFIG_IPADDR) += \
+lib-$(CONFIG_FEATURE_IP_ADDRESS) += \
 	ip_parse_common_args.o \
 	ipaddress.o \
 	libnetlink.o \
@@ -32,7 +27,7 @@ lib-$(CONFIG_IPADDR) += \
 	rt_names.o \
 	utils.o
 
-lib-$(CONFIG_IPLINK) += \
+lib-$(CONFIG_FEATURE_IP_LINK) += \
 	ip_parse_common_args.o \
 	ipaddress.o \
 	iplink.o \
@@ -43,7 +38,7 @@ lib-$(CONFIG_IPLINK) += \
 	rt_names.o \
 	utils.o
 
-lib-$(CONFIG_IPROUTE) += \
+lib-$(CONFIG_FEATURE_IP_ROUTE) += \
 	ip_parse_common_args.o \
 	iproute.o \
 	libnetlink.o \
@@ -52,13 +47,13 @@ lib-$(CONFIG_IPROUTE) += \
 	rtm_map.o \
 	utils.o
 
-lib-$(CONFIG_IPTUNNEL) += \
+lib-$(CONFIG_FEATURE_IP_TUNNEL) += \
 	ip_parse_common_args.o \
 	iptunnel.o \
 	rt_names.o \
 	utils.o
 
-lib-$(CONFIG_IPRULE) += \
+lib-$(CONFIG_FEATURE_IP_RULE) += \
 	ip_parse_common_args.o \
 	iprule.o \
 	rt_names.o \
-- 
cgit v1.1