Fix a couple (well, little more than that..) of typos.

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

diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 76e589593381422b92b1151dcd1a09e7f86b5d21..18aa806e41df591ce50d1e558543391be56aadce 100644 (file)
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -1,34 +1,43 @@
+##############################
+# Start SUBSYSTEM LIBNETIF
+[SUBSYSTEM::LIBNETIF]
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBREPLACE_NETWORK
+# End SUBSYSTEM LIBNETIF
+##############################
 
-################################################
-# Start MODULE socket_ipv4
-[MODULE::socket_ipv4]
-INIT_OBJ_FILES = \
-               lib/socket/socket_ipv4.o
-# 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]
-INIT_OBJ_FILES = \
-               lib/socket/socket_ipv6.o
-# 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]
-INIT_OBJ_FILES = \
-               lib/socket/socket_unix.o
+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]
-INIT_OBJ_FILES = \
-               lib/socket/socket.o
-ADD_OBJ_FILES = \
-               lib/socket/access.o
+[SUBSYSTEM::samba-socket]
+PUBLIC_DEPENDENCIES = LIBTALLOC
+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)
+