summaryrefslogtreecommitdiff
path: root/source4/lib/socket/config.mk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-03 22:39:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:03:39 -0500
commitbfb6d6a35ed18a2a99230283c1fd0302a1219a0e (patch)
tree4aa0310b90789b317056bb742cd73323cbb645d5 /source4/lib/socket/config.mk
parent8e2d624a588552f5d06f21fe37281615f3ec6296 (diff)
downloadsamba-bfb6d6a35ed18a2a99230283c1fd0302a1219a0e.tar.gz
samba-bfb6d6a35ed18a2a99230283c1fd0302a1219a0e.tar.bz2
samba-bfb6d6a35ed18a2a99230283c1fd0302a1219a0e.zip
r24939: Integrate IPv4 and IPv6 modules (a lot of code can be shared).
(This used to be commit 15f47aaf533bec4d7d82d75d27c233b3b0b261cd)
Diffstat (limited to 'source4/lib/socket/config.mk')
-rw-r--r--source4/lib/socket/config.mk19
1 files changed, 4 insertions, 15 deletions
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
################################################
################################################