From bfb6d6a35ed18a2a99230283c1fd0302a1219a0e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Sep 2007 22:39:16 +0000
Subject: r24939: Integrate IPv4 and IPv6 modules (a lot of code can be
 shared). (This used to be commit 15f47aaf533bec4d7d82d75d27c233b3b0b261cd)

---
 source4/lib/socket/config.mk | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'source4/lib/socket/config.mk')

diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 22037cd136..d1e0bcfef5 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -10,25 +10,14 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL EXT_SOCKET EXT_NSL
 ##############################
 
 ################################################
-# Start MODULE socket_ipv4
-[MODULE::socket_ipv4]
+# Start MODULE socket_ip
+[MODULE::socket_ip]
 SUBSYSTEM = samba-socket
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
-		socket_ipv4.o
+		socket_ip.o
 PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBSAMBA-ERRORS 
-# End MODULE socket_ipv4
-################################################
-
-################################################
-# Start MODULE socket_ipv6
-[MODULE::socket_ipv6]
-SUBSYSTEM = samba-socket
-OUTPUT_TYPE = INTEGRATED
-OBJ_FILES = \
-		socket_ipv6.o
-PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL
-# End MODULE socket_ipv6
+# End MODULE socket_ip
 ################################################
 
 ################################################
-- 
cgit