r17586: merge lib/netif into lib/socket and use -lnsl -lsocket on the

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

diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index fe4e00eedf7e6a26249c226cbf42cb6a5ef099ed..a823efb23e5c8dc58ee0d8d50a2aa1c63ba7b65b 100644 (file)
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -1,46 +1,59 @@
+##############################
+# Start SUBSYSTEM LIBNETIF
+[SUBSYSTEM::LIBNETIF]
+PRIVATE_PROTO_HEADER = netif_proto.h
+OBJ_FILES = \
+               interface.o \
+               netif.o
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL EXT_SOCKET EXT_NSL
+# End SUBSYSTEM LIBNETIF
+##############################
 
 ################################################
 # Start MODULE socket_ipv4
 [MODULE::socket_ipv4]
-SUBSYSTEM = SOCKET
-OUTPUT_TYPE = MERGEDOBJ
+SUBSYSTEM = samba-socket
+OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_ipv4.o
-PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
+PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS 
 # End MODULE socket_ipv4
 ################################################
 
 ################################################
 # Start MODULE socket_ipv6
 [MODULE::socket_ipv6]
-SUBSYSTEM = SOCKET
-OUTPUT_TYPE = MERGEDOBJ
+SUBSYSTEM = samba-socket
+OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_ipv6.o
-PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
 # End MODULE socket_ipv6
 ################################################
 
 ################################################
 # Start MODULE socket_unix
 [MODULE::socket_unix]
-SUBSYSTEM = SOCKET
-OUTPUT_TYPE = MERGEDOBJ
+SUBSYSTEM = samba-socket
+OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_unix.o
-PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
 # End MODULE socket_unix
 ################################################
 
 ################################################
 # Start SUBSYSTEM SOCKET
-[SUBSYSTEM::SOCKET]
+[SUBSYSTEM::samba-socket]
 OBJ_FILES = \
                socket.o \
                access.o \
                connect_multi.o \
                connect.o
+LDFLAGS = $(SUBSYSTEM_LIBCLI_RESOLVE_OUTPUT) $(SUBSYSTEM_LIBCLI_NBT_OUTPUT) $(SUBSYSTEM_NDR_NBT_OUTPUT) $(LIBRARY_NDR_SVCCTL_OUTPUT)
 PUBLIC_DEPENDENCIES = LIBTALLOC
-PRIVATE_DEPENDENCIES = LIBCLI_RESOLVE SOCKET_WRAPPER 
+PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE 
+#LIBCLI_RESOLVE
 # End SUBSYSTEM SOCKET
 ################################################