r15344: Fix shared library build

[bbaumbach/samba-autobuild/.git] / source4 / lib / socket / config.mk

diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index e9f29b07905f908b9fcfc009fe7a423ff245c72f..4c4dbb291517fbd7f0836cc8552f1247d4899c17 100644 (file)
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -3,11 +3,11 @@
 # Start MODULE socket_ipv4
 [MODULE::socket_ipv4]
 SUBSYSTEM = SOCKET
-OUTPUT_TYPE = MERGEDOBJ
+OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_ipv4.o
-NOPROTO=YES
-REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET
+PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS
 # End MODULE socket_ipv4
 ################################################
 
@@ -15,11 +15,10 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
 # Start MODULE socket_ipv6
 [MODULE::socket_ipv6]
 SUBSYSTEM = SOCKET
-OUTPUT_TYPE = MERGEDOBJ
+OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_ipv6.o
-NOPROTO=YES
-REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET
 # End MODULE socket_ipv6
 ################################################
 
@@ -27,11 +26,10 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
 # Start MODULE socket_unix
 [MODULE::socket_unix]
 SUBSYSTEM = SOCKET
-OUTPUT_TYPE = MERGEDOBJ
+OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_unix.o
-NOPROTO=YES
-REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET
 # End MODULE socket_unix
 ################################################
 
@@ -43,7 +41,9 @@ OBJ_FILES = \
                access.o \
                connect_multi.o \
                connect.o
-NOPROTO=YES
-REQUIRED_SUBSYSTEMS = LIBCLI_RESOLVE SOCKET_WRAPPER LIBTALLOC
+LDFLAGS = $(SUBSYSTEM_LIBCLI_RESOLVE_OUTPUT) $(SUBSYSTEM_LIBCLI_NBT_OUTPUT) $(SUBSYSTEM_NDR_NBT_OUTPUT) $(LIBRARY_NDR_SVCCTL_OUTPUT)
+PUBLIC_DEPENDENCIES = LIBTALLOC
+PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE 
+#LIBCLI_RESOLVE
 # End SUBSYSTEM SOCKET
 ################################################