summaryrefslogtreecommitdiff
path: root/source4/lib/socket
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-02 00:16:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:35 -0500
commitbc4aebfaecf52678eb40aee2fd4bd81a315c554d (patch)
treedb09ef34f7adc46c9fd6a1398bc225eac0b85917 /source4/lib/socket
parent55eaed5aa2c1c4a6c417278ca08652f12fb9e7b9 (diff)
downloadsamba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.tar.gz
samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.tar.bz2
samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.zip
r12670: Make a couple of dependencies stricter
Re-introduce and use the OUTPUT_TYPE property for MODULEs to force specific modules to always be included (This used to be commit f9eede3d40098eddc3618ee48f9253cdddb94a6f)
Diffstat (limited to 'source4/lib/socket')
-rw-r--r--source4/lib/socket/config.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 60db3ab07e..ad555522a3 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -3,6 +3,7 @@
# Start MODULE socket_ipv4
[MODULE::socket_ipv4]
SUBSYSTEM = SOCKET
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
socket_ipv4.o
NOPROTO=YES
@@ -13,6 +14,7 @@ NOPROTO=YES
# Start MODULE socket_ipv6
[MODULE::socket_ipv6]
SUBSYSTEM = SOCKET
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
socket_ipv6.o
NOPROTO=YES
@@ -23,6 +25,7 @@ NOPROTO=YES
# Start MODULE socket_unix
[MODULE::socket_unix]
SUBSYSTEM = SOCKET
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
socket_unix.o
NOPROTO=YES