Rename samba-socket -> samba_socket to fix a couple more compiler

[metze/samba/wip.git] / source4 / lib / socket / config.mk

diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index fe64c90b818783b6a0224dfc93133a1a5eb0eda5..ac515c8f6dfead2d3ed2b54ed5474c9e4e04f77a 100644 (file)
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -1,45 +1,43 @@
 ##############################
 # 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
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBREPLACE_NETWORK
 # End SUBSYSTEM LIBNETIF
 ##############################
 
+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_ip
 [MODULE::socket_ip]
-SUBSYSTEM = samba-socket
-OUTPUT_TYPE = INTEGRATED
-OBJ_FILES = \
-               socket_ip.o
-PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBSAMBA-ERRORS 
+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 = samba-socket
-OUTPUT_TYPE = INTEGRATED
-OBJ_FILES = \
-               socket_unix.o
-PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL
+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::samba-socket]
-OBJ_FILES = \
-               socket.o \
-               access.o \
-               connect_multi.o \
-               connect.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)
+