path: root/net/dccp/Makefile
diff options
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2006-11-14 11:50:36 -0200
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:22:28 -0800
commit6a128e053e75a5f1be9fb53d0d53159f88197c61 (patch)
treedaf48f5e7bd6f9ac7ee916736e78ead05205c0bd /net/dccp/Makefile
parentb9df3cb8cf9a96e63dfdcd3056a9cbc71f2459e7 (diff)
[DCCPv6]: Resolve conditional build problem
Resolves the problem that if IPv6 was configured `y' and DCCP `m' then dccp_ipv6 was not built as a module. With this change, dccp_ipv6 is built as a module whenever DCCP *OR* IPv6 are configured as modules; it will be built-in only if both DCCP = `y' and IPV6 = `y'. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net/dccp/Makefile')
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/Makefile b/net/dccp/Makefile
index 17ed99c4661..f4f8793aaff 100644
--- a/net/dccp/Makefile
+++ b/net/dccp/Makefile
@@ -1,13 +1,13 @@
-obj-$(CONFIG_IPV6) += dccp_ipv6.o
-dccp_ipv6-y := ipv6.o
obj-$(CONFIG_IP_DCCP) += dccp.o dccp_ipv4.o
dccp-y := ccid.o feat.o input.o minisocks.o options.o output.o proto.o timer.o
dccp_ipv4-y := ipv4.o
+# build dccp_ipv6 as module whenever either IPv6 or DCCP is a module
+obj-$(subst y,$(CONFIG_IP_DCCP),$(CONFIG_IPV6)) += dccp_ipv6.o
+dccp_ipv6-y := ipv6.o
dccp-$(CONFIG_IP_DCCP_ACKVEC) += ackvec.o
obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o