+##############################
+# Start SUBSYSTEM LIBNETIF
+[SUBSYSTEM::LIBNETIF]
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBREPLACE_NETWORK
+# End SUBSYSTEM LIBNETIF
+##############################
-################################################
-# Start MODULE socket_ipv4
-[MODULE::socket_ipv4]
-SUBSYSTEM = SOCKET
-OUTPUT_TYPE = INTEGRATED
-OBJ_FILES = \
- socket_ipv4.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET
-PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS
-# End MODULE socket_ipv4
-################################################
+LIBNETIF_OBJ_FILES = $(addprefix $(libsocketsrcdir)/, interface.o netif.o)
+
+$(eval $(call proto_header_template,$(libsocketsrcdir)/netif_proto.h,$(LIBNETIF_OBJ_FILES:.o=.c)))
################################################
-# Start MODULE socket_ipv6
-[MODULE::socket_ipv6]
-SUBSYSTEM = SOCKET
-OUTPUT_TYPE = INTEGRATED
-OBJ_FILES = \
- socket_ipv6.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET
-# End MODULE socket_ipv6
+# Start MODULE socket_ip
+[MODULE::socket_ip]
+SUBSYSTEM = samba-socket
+OUTPUT_TYPE = MERGED_OBJ
+PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS LIBREPLACE_NETWORK
+# End MODULE socket_ip
################################################
+socket_ip_OBJ_FILES = $(libsocketsrcdir)/socket_ip.o
+
################################################
# Start MODULE socket_unix
[MODULE::socket_unix]
-SUBSYSTEM = SOCKET
-OUTPUT_TYPE = INTEGRATED
-OBJ_FILES = \
- socket_unix.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET
+SUBSYSTEM = samba-socket
+OUTPUT_TYPE = MERGED_OBJ
+PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
# End MODULE socket_unix
################################################
+socket_unix_OBJ_FILES = $(libsocketsrcdir)/socket_unix.o
+
################################################
# Start SUBSYSTEM SOCKET
-[SUBSYSTEM::SOCKET]
-OBJ_FILES = \
- socket.o \
- access.o \
- connect_multi.o \
- connect.o
-LDFLAGS = -lcli_resolve -lcli_nbt -lndr_nbt -lndr_svcctl
+[SUBSYSTEM::samba-socket]
PUBLIC_DEPENDENCIES = LIBTALLOC
-PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE
-#LIBCLI_RESOLVE
+PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE LIBCLI_RESOLVE
# End SUBSYSTEM SOCKET
################################################
+
+samba-socket_OBJ_FILES = $(addprefix $(libsocketsrcdir)/, socket.o access.o connect_multi.o connect.o)
+