diff options
| -rw-r--r-- | source4/auth/kerberos/config.mk | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 4 | ||||
| -rw-r--r-- | source4/lib/socket/config.mk | 8 | ||||
| -rw-r--r-- | source4/libcli/config.mk | 8 | ||||
| -rw-r--r-- | source4/libcli/ldap/config.mk | 2 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 4 | ||||
| -rw-r--r-- | source4/utils/config.mk | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk index 16a1c5fc71..f65ebec63a 100644 --- a/source4/auth/kerberos/config.mk +++ b/source4/auth/kerberos/config.mk @@ -9,7 +9,7 @@ OBJ_FILES = kerberos.o \ kerberos_pac.o \ gssapi_parse.o \ krb5_init_context.o -PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC LIBSAMBA-SOCKET LIBCLI_RESOLVE +PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE PRIVATE_DEPENDENCIES = ASN1_UTIL HEIMDAL_ROKEN_ADDRINFO auth_sam # End SUBSYSTEM KERBEROS ################################# diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 67f591de1d..3423b2ec75 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -442,7 +442,7 @@ sub PkgConfig($$) foreach (@{$ctx->{PUBLIC_DEPENDENCIES}}) { # next unless ($self-> ) { - $pubs .= "$_ "; +#FIXME $pubs .= "$_ "; } } @@ -450,7 +450,7 @@ sub PkgConfig($$) foreach (@{$ctx->{PRIVATE_DEPENDENCIES}}) { # next unless ($self-> ) { - $privs .= "$_ "; +#FIXME $privs .= "$_ "; } } diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index fc3f59b580..1e22edb1d7 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -2,7 +2,7 @@ ################################################ # Start MODULE socket_ipv4 [MODULE::socket_ipv4] -SUBSYSTEM = LIBSAMBA-SOCKET +SUBSYSTEM = samba-socket OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_ipv4.o @@ -14,7 +14,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS ################################################ # Start MODULE socket_ipv6 [MODULE::socket_ipv6] -SUBSYSTEM = LIBSAMBA-SOCKET +SUBSYSTEM = samba-socket OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_ipv6.o @@ -25,7 +25,7 @@ PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL ################################################ # Start MODULE socket_unix [MODULE::socket_unix] -SUBSYSTEM = LIBSAMBA-SOCKET +SUBSYSTEM = samba-socket OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_unix.o @@ -35,7 +35,7 @@ PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL ################################################ # Start SUBSYSTEM SOCKET -[SUBSYSTEM::LIBSAMBA-SOCKET] +[SUBSYSTEM::samba-socket] OBJ_FILES = \ socket.o \ access.o \ diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 0e680215d3..f3e9be7f63 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -54,7 +54,7 @@ OBJ_FILES = \ nbt/namerefresh.o \ nbt/namerelease.o PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \ - NDR_SECURITY LIBSAMBA-SOCKET + NDR_SECURITY samba-socket [SUBSYSTEM::LIBCLI_DGRAM] OBJ_FILES = \ @@ -80,7 +80,7 @@ SO_VERSION = 0 DESCRIPTION = WINS Replication client library OBJ_FILES = \ wrepl/winsrepl.o -PUBLIC_DEPENDENCIES = NDR_WINSREPL LIBSAMBA-SOCKET LIBCLI_RESOLVE LIBEVENTS +PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBCLI_RESOLVE LIBEVENTS [SUBSYSTEM::LIBCLI_RESOLVE] PRIVATE_PROTO_HEADER = resolve/proto.h @@ -114,12 +114,12 @@ OBJ_FILES = clireadwrite.o \ clideltree.o PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \ LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \ - LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS LIBSAMBA-SOCKET + LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket [SUBSYSTEM::LIBCLI_RAW] PRIVATE_PROTO_HEADER = raw/raw_proto.h PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE -PUBLIC_DEPENDENCIES = LIBSAMBA-SOCKET LIBPACKET gensec LIBCRYPTO +PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO LDFLAGS = $(SUBSYSTEM_LIBCLI_SMB_COMPOSITE_OUTPUT) OBJ_FILES = raw/rawfile.o \ raw/smb_signing.o \ diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk index c1c74cd168..88ebc3256f 100644 --- a/source4/libcli/ldap/config.mk +++ b/source4/libcli/ldap/config.mk @@ -11,7 +11,7 @@ OBJ_FILES = ldap.o \ ldap_ildap.o \ ldap_controls.o PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET -PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LIBSAMBA-SOCKET LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL +PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL #PRIVATE_DEPENDENCIES = gensec # End SUBSYSTEM LIBCLI_LDAP ################################# diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 895caa6912..e2d29a73a0 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -592,8 +592,8 @@ OBJ_FILES = \ rpc/dcerpc_smb2.o \ rpc/dcerpc_sock.o \ rpc/dcerpc_connect.o -PUBLIC_DEPENDENCIES = \ - LIBSAMBA-SOCKET LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \ +PRIVATE_DEPENDENCIES = \ + samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \ LIBNDR NDR_DCERPC \ RPC_NDR_EPMAPPER \ NDR_SCHANNEL RPC_NDR_NETLOGON \ diff --git a/source4/utils/config.mk b/source4/utils/config.mk index f5b42b30ea..cc89f5cc4f 100644 --- a/source4/utils/config.mk +++ b/source4/utils/config.mk @@ -98,7 +98,7 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ LIBPOPT \ - LIBSAMBA-SOCKET \ + samba-socket \ POPT_SAMBA \ LIBCLI_RESOLVE \ CHARSET |