diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-04-15 09:54:41 +0200 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-04-15 09:54:41 +0200 |
commit | b967afca648eea481e586f367f99464418cf8468 (patch) | |
tree | 3fbe9cc92a21013cbd1eb2b6fa1b73ccddfbb151 /source4/lib/socket | |
parent | 9cd04363f56ba5ee4f8b1ffaf662fe81cc995e99 (diff) | |
parent | afaba23131dc079be3cd92e87495ec8b2ebdc4ae (diff) | |
download | samba-b967afca648eea481e586f367f99464418cf8468.tar.gz samba-b967afca648eea481e586f367f99464418cf8468.tar.bz2 samba-b967afca648eea481e586f367f99464418cf8468.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit e891157b4ec7b2f845fb20c4106d80bf169f2072)
Diffstat (limited to 'source4/lib/socket')
-rw-r--r-- | source4/lib/socket/config.mk | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index 777882f6e0..2400190175 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -2,44 +2,41 @@ # Start SUBSYSTEM LIBNETIF [SUBSYSTEM::LIBNETIF] PRIVATE_PROTO_HEADER = netif_proto.h -OBJ_FILES = \ - interface.o \ - netif.o PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBREPLACE_NETWORK # End SUBSYSTEM LIBNETIF ############################## +LIBNETIF_OBJ_FILES = $(addprefix lib/socket/, interface.o netif.o) + ################################################ # Start MODULE socket_ip [MODULE::socket_ip] SUBSYSTEM = samba-socket OUTPUT_TYPE = MERGED_OBJ -OBJ_FILES = \ - socket_ip.o PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS LIBREPLACE_NETWORK # End MODULE socket_ip ################################################ +socket_ip_OBJ_FILES = lib/socket/socket_ip.o + ################################################ # Start MODULE socket_unix [MODULE::socket_unix] SUBSYSTEM = samba-socket OUTPUT_TYPE = MERGED_OBJ -OBJ_FILES = \ - socket_unix.o PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK # End MODULE socket_unix ################################################ +socket_unix_OBJ_FILES = lib/socket/socket_unix.o + ################################################ # Start SUBSYSTEM SOCKET [SUBSYSTEM::samba-socket] -OBJ_FILES = \ - socket.o \ - access.o \ - connect_multi.o \ - connect.o PUBLIC_DEPENDENCIES = LIBTALLOC PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE LIBCLI_RESOLVE # End SUBSYSTEM SOCKET ################################################ + +samba-socket_OBJ_FILES = $(addprefix lib/socket/, socket.o access.o connect_multi.o connect.o) + |