[SCM] Samba Shared Repository - branch master updated -
1feab85be605269db272a4b48375fd85845b7ffd
Jelmer Vernooij
jelmer at samba.org
Tue Dec 23 23:16:53 GMT 2008
The branch, master has been updated
via 1feab85be605269db272a4b48375fd85845b7ffd (commit)
from 30bdb68c9ebe281d8c512f8b737141d76a7c7d68 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1feab85be605269db272a4b48375fd85845b7ffd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Dec 24 00:15:43 2008 +0100
Rename samba-socket -> samba_socket to fix a couple more compiler
warnings.
-----------------------------------------------------------------------
Summary of changes:
source4/auth/gensec/config.mk | 2 +-
source4/auth/kerberos/config.mk | 2 +-
source4/lib/messaging/config.mk | 2 +-
source4/lib/socket/config.mk | 8 ++++----
source4/lib/tls/config.mk | 2 +-
source4/libcli/config.mk | 8 ++++----
source4/libcli/ldap/config.mk | 2 +-
source4/librpc/config.mk | 2 +-
source4/smbd/config.mk | 2 +-
source4/utils/config.mk | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index f08ff26..3c2fa51 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -2,7 +2,7 @@
# Start SUBSYSTEM gensec
[LIBRARY::gensec]
PUBLIC_DEPENDENCIES = \
- CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba-socket LIBPACKET
+ CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba_socket LIBPACKET
# End SUBSYSTEM gensec
#################################
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index 951e247..b724b8d 100644
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -1,7 +1,7 @@
#################################
# Start SUBSYSTEM KERBEROS
[SUBSYSTEM::KERBEROS]
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE
PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply LIBPACKET LIBNDR
# End SUBSYSTEM KERBEROS
#################################
diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
index e92f78c..b5b1e6d 100644
--- a/source4/lib/messaging/config.mk
+++ b/source4/lib/messaging/config.mk
@@ -7,7 +7,7 @@ PUBLIC_DEPENDENCIES = \
UTIL_TDB \
CLUSTER \
LIBNDR \
- samba-socket
+ samba_socket
MESSAGING_OBJ_FILES = $(libmessagingsrcdir)/messaging.o
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 18aa806..ac515c8 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -12,7 +12,7 @@ $(eval $(call proto_header_template,$(libsocketsrcdir)/netif_proto.h,$(LIBNETIF_
################################################
# Start MODULE socket_ip
[MODULE::socket_ip]
-SUBSYSTEM = samba-socket
+SUBSYSTEM = samba_socket
OUTPUT_TYPE = MERGED_OBJ
PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS LIBREPLACE_NETWORK
# End MODULE socket_ip
@@ -23,7 +23,7 @@ socket_ip_OBJ_FILES = $(libsocketsrcdir)/socket_ip.o
################################################
# Start MODULE socket_unix
[MODULE::socket_unix]
-SUBSYSTEM = samba-socket
+SUBSYSTEM = samba_socket
OUTPUT_TYPE = MERGED_OBJ
PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
# End MODULE socket_unix
@@ -33,11 +33,11 @@ socket_unix_OBJ_FILES = $(libsocketsrcdir)/socket_unix.o
################################################
# Start SUBSYSTEM SOCKET
-[SUBSYSTEM::samba-socket]
+[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)
+samba_socket_OBJ_FILES = $(addprefix $(libsocketsrcdir)/, socket.o access.o connect_multi.o connect.o)
diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk
index e01f79c..ff1eedf 100644
--- a/source4/lib/tls/config.mk
+++ b/source4/lib/tls/config.mk
@@ -1,5 +1,5 @@
[SUBSYSTEM::LIBTLS]
PUBLIC_DEPENDENCIES = \
- LIBTALLOC GNUTLS LIBSAMBA-HOSTCONFIG samba-socket
+ LIBTALLOC GNUTLS LIBSAMBA-HOSTCONFIG samba_socket
LIBTLS_OBJ_FILES = $(addprefix $(libtlssrcdir)/, tls.o tlscert.o)
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 9bf262f..60baf83 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -46,7 +46,7 @@ $(eval $(call proto_header_template,$(libclinbtsrcdir)/nbtname.h,$(NDR_NBT_BUF_O
[SUBSYSTEM::LIBCLI_NBT]
PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
- NDR_SECURITY samba-socket LIBSAMBA-UTIL
+ NDR_SECURITY samba_socket LIBSAMBA-UTIL
LIBCLI_NBT_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/, \
nbtsocket.o \
@@ -106,7 +106,7 @@ LIBCLI_CLDAP_OBJ_FILES = $(libclisrcdir)/cldap/cldap.o
# PUBLIC_HEADERS += $(libclisrcdir)/cldap/cldap.h
[SUBSYSTEM::LIBCLI_WREPL]
-PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBEVENTS LIBPACKET
+PUBLIC_DEPENDENCIES = NDR_WINSREPL samba_socket LIBEVENTS LIBPACKET
LIBCLI_WREPL_OBJ_FILES = $(libclisrcdir)/wrepl/winsrepl.o
@@ -139,7 +139,7 @@ $(eval $(call proto_header_template,$(libclisrcdir)/finddcs.h,$(LIBCLI_FINDDCS_O
[SUBSYSTEM::LIBCLI_SMB]
PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
- LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket
+ LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket
LIBCLI_SMB_OBJ_FILES = $(addprefix $(libclisrcdir)/, \
clireadwrite.o \
@@ -157,7 +157,7 @@ $(eval $(call proto_header_template,$(libclisrcdir)/libcli_proto.h,$(LIBCLI_SMB_
[SUBSYSTEM::LIBCLI_RAW]
PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR
#LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT)
-PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO CREDENTIALS
+PUBLIC_DEPENDENCIES = samba_socket LIBPACKET gensec LIBCRYPTO CREDENTIALS
LIBCLI_RAW_OBJ_FILES = $(addprefix $(libclisrcdir)/raw/, rawfile.o smb_signing.o clisocket.o \
clitransport.o clisession.o clitree.o clierror.o rawrequest.o \
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index 02678ee..2e50596 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,6 +1,6 @@
[SUBSYSTEM::LIBCLI_LDAP]
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET
-PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket NDR_SAMR LIBTLS ASN1_UTIL \
+PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS ASN1_UTIL \
LDAP_ENCODE LIBNDR LP_RESOLVE gensec
LIBCLI_LDAP_OBJ_FILES = $(addprefix $(libclisrcdir)/ldap/, \
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index a034344..c26aeeb 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -605,7 +605,7 @@ PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, gen_ndr/dcerpc.h gen_ndr/ndr_dce
# Start SUBSYSTEM dcerpc
[LIBRARY::dcerpc]
PRIVATE_DEPENDENCIES = \
- samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
+ samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER \
NDR_SCHANNEL RPC_NDR_NETLOGON \
RPC_NDR_MGMT \
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 26b2c44..e0b09f4 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -2,7 +2,7 @@
[SUBSYSTEM::service]
PRIVATE_DEPENDENCIES = \
- LIBEVENTS MESSAGING samba-socket NDR_NAMED_PIPE_AUTH
+ LIBEVENTS MESSAGING samba_socket NDR_NAMED_PIPE_AUTH
service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \
service.o \
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 0b98dcf..ea8e00f 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -69,7 +69,7 @@ PRIVATE_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG \
LIBSAMBA-UTIL \
LIBPOPT \
- samba-socket \
+ samba_socket \
POPT_SAMBA \
LIBCLI_RESOLVE \
CHARSET
--
Samba Shared Repository
More information about the samba-cvs
mailing list