svn commit: samba r15313 - in branches/SAMBA_4_0/source:
auth/kerberos build/smb_build dsdb heimdal_build lib/socket
libcli libcli/ldap librpc smb_server/smb smb_server/smb2
jelmer at samba.org
jelmer at samba.org
Sat Apr 29 02:45:36 GMT 2006
Author: jelmer
Date: 2006-04-29 02:45:34 +0000 (Sat, 29 Apr 2006)
New Revision: 15313
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15313
Log:
Fix some dependencies in dso mode
Modified:
branches/SAMBA_4_0/source/auth/kerberos/config.mk
branches/SAMBA_4_0/source/build/smb_build/input.pm
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/dsdb/config.mk
branches/SAMBA_4_0/source/heimdal_build/config.mk
branches/SAMBA_4_0/source/lib/socket/config.mk
branches/SAMBA_4_0/source/libcli/config.mk
branches/SAMBA_4_0/source/libcli/ldap/config.mk
branches/SAMBA_4_0/source/librpc/config.mk
branches/SAMBA_4_0/source/smb_server/smb/config.mk
branches/SAMBA_4_0/source/smb_server/smb2/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/config.mk 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.mk 2006-04-29 02:45:34 UTC (rev 15313)
@@ -9,7 +9,7 @@
kerberos_pac.o \
gssapi_parse.o \
krb5_init_context.o
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET LIBCLI_RESOLVE
PRIVATE_DEPENDENCIES = ASN1_UTIL HEIMDAL_ROKEN_ADDRINFO auth_sam
# End SUBSYSTEM KERBEROS
#################################
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-04-29 02:45:34 UTC (rev 15313)
@@ -117,6 +117,8 @@
my ($lib, $depend) = @_;
foreach my $mod (values %$depend) {
+ next if(not defined($mod->{OUTPUT_TYPE}));
+ next if($mod->{OUTPUT_TYPE} ne "INTEGRATED");
next if(not defined($mod->{SUBSYSTEM}));
next if($mod->{SUBSYSTEM} ne $lib->{NAME});
next if($mod->{ENABLE} ne "YES");
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-29 02:45:34 UTC (rev 15313)
@@ -240,6 +240,7 @@
}
}
+ $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->_prepare_list($ctx, "OBJ_LIST");
$self->_prepare_list($ctx, "FULL_OBJ_LIST");
$self->_prepare_list($ctx, "DEPEND_LIST");
@@ -324,6 +325,7 @@
push (@{$self->{static_libs}}, $ctx->{TARGET});
+ $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->_prepare_list($ctx, "OBJ_LIST");
$self->_prepare_list($ctx, "FULL_OBJ_LIST");
Modified: branches/SAMBA_4_0/source/dsdb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/dsdb/config.mk 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/dsdb/config.mk 2006-04-29 02:45:34 UTC (rev 15313)
@@ -7,7 +7,7 @@
[SUBSYSTEM::SAMDB]
PUBLIC_PROTO_HEADER = samdb/samdb_proto.h
PUBLIC_HEADERS = samdb/samdb.h
-PUBLIC_DEPENDENCIES = ldb LIBCLI_LDAP HEIMDAL_KRB5
+PUBLIC_DEPENDENCIES = ldb LIBCLI_LDAP HEIMDAL_KRB5
OBJ_FILES = \
samdb/samdb.o \
samdb/samdb_privilege.o \
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-04-29 02:45:34 UTC (rev 15313)
@@ -355,7 +355,8 @@
HEIMDAL_ROKEN_INET_ATON \
HEIMDAL_ROKEN_GETPROGNAME \
GAI \
- NSL
+ NSL \
+ LIBREPLACE
# End SUBSYSTEM HEIMDAL_ROKEN
#######################
@@ -484,7 +485,7 @@
CFLAGS = -Iheimdal_build
OBJ_FILES = ../heimdal/lib/vers/print_version.o
PUBLIC_DEPENDENCIES = \
- LIBREPLACE HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \
+ HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \
RESOLV
# End SUBSYSTEM HEIMDAL
#######################
Modified: branches/SAMBA_4_0/source/lib/socket/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/config.mk 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/lib/socket/config.mk 2006-04-29 02:45:34 UTC (rev 15313)
@@ -41,7 +41,7 @@
access.o \
connect_multi.o \
connect.o
-LDFLAGS = -lcli_resolve -lcli_nbt -lndr_nbt -lndr_svcctl
+LDFLAGS = $(LIBRARY_LIBCLI_RESOLVE_OUTPUT) $(LIBRARY_LIBCLI_NBT_OUTPUT) $(SUBSYSTEM_NDR_NBT_OUTPUT) $(SUBSYSTEM_NDR_SVCCTL_OUTPUT)
PUBLIC_DEPENDENCIES = LIBTALLOC
PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE
#LIBCLI_RESOLVE
Modified: branches/SAMBA_4_0/source/libcli/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/config.mk 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/libcli/config.mk 2006-04-29 02:45:34 UTC (rev 15313)
@@ -53,8 +53,8 @@
nbt/nameregister.o \
nbt/namerefresh.o \
nbt/namerelease.o
-PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT SOCKET LIBCLI_COMPOSITE LIBEVENTS \
- NDR_SECURITY
+PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
+ NDR_SECURITY SOCKET
[SUBSYSTEM::LIBCLI_DGRAM]
OBJ_FILES = \
@@ -80,7 +80,7 @@
DESCRIPTION = WINS Replication client library
OBJ_FILES = \
wrepl/winsrepl.o
-PUBLIC_DEPENDENCIES = NDR_WINSREPL SOCKET LIBEVENTS
+PUBLIC_DEPENDENCIES = NDR_WINSREPL SOCKET LIBCLI_RESOLVE LIBEVENTS
[SUBSYSTEM::LIBCLI_RESOLVE]
PRIVATE_PROTO_HEADER = resolve/proto.h
@@ -109,7 +109,7 @@
LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS
[SUBSYSTEM::LIBSMB]
-PUBLIC_DEPENDENCIES = LIBCLI SOCKET
+PUBLIC_DEPENDENCIES = LIBCLI SOCKET LIBCLI_RESOLVE
PUBLIC_PROTO_HEADER = libcli_proto.h
OBJ_FILES = clireadwrite.o \
cliconnect.o \
@@ -123,7 +123,7 @@
PRIVATE_PROTO_HEADER = raw/raw_proto.h
PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE
PUBLIC_DEPENDENCIES = LIBCLI_RAW_KRB5
-LDFLAGS = -lcli_smb_composite
+LDFLAGS = $(SUBSYSTEM_LIBCLI_SMB_COMPOSITE_OUTPUT)
OBJ_FILES = raw/rawfile.o \
raw/smb_signing.o \
raw/clisocket.o \
Modified: branches/SAMBA_4_0/source/libcli/ldap/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/config.mk 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/libcli/ldap/config.mk 2006-04-29 02:45:34 UTC (rev 15313)
@@ -11,7 +11,7 @@
ldap_ildap.o \
ldap_controls.o
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET
-PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE SOCKET NDR_SAMR LIBTLS ASN1_UTIL
+PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE SOCKET LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL
#PRIVATE_DEPENDENCIES = gensec
# End SUBSYSTEM LIBCLI_LDAP
#################################
Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/librpc/config.mk 2006-04-29 02:45:34 UTC (rev 15313)
@@ -605,11 +605,11 @@
rpc/dcerpc_sock.o \
rpc/dcerpc_connect.o
PUBLIC_DEPENDENCIES = \
- SOCKET LIBSMB LIBCLI_SMB2 \
+ SOCKET LIBCLI_RESOLVE LIBSMB LIBCLI_SMB2 \
LIBNDR NDR_DCERPC \
RPC_NDR_EPMAPPER \
NDR_SCHANNEL RPC_NDR_NETLOGON \
- gensec LIBCLI_AUTH
+ gensec LIBCLI_AUTH LIBCLI_RAW
# End SUBSYSTEM dcerpc
################################################
Modified: branches/SAMBA_4_0/source/smb_server/smb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/config.mk 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/smb_server/smb/config.mk 2006-04-29 02:45:34 UTC (rev 15313)
@@ -16,6 +16,6 @@
signing.o
PUBLIC_DEPENDENCIES = \
ntvfs LIBPACKET
-LDFLAGS = -lsmb_server
+LDFLAGS = $(LIBRARY_SMB_SERVER_OUTPUT)
# End SUBSYSTEM SMB_PROTOCOL
#######################
Modified: branches/SAMBA_4_0/source/smb_server/smb2/config.mk
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/config.mk 2006-04-29 02:45:06 UTC (rev 15312)
+++ branches/SAMBA_4_0/source/smb_server/smb2/config.mk 2006-04-29 02:45:34 UTC (rev 15313)
@@ -11,6 +11,6 @@
keepalive.o
PUBLIC_DEPENDENCIES = \
ntvfs LIBPACKET LIBCLI_SMB2
-LDFLAGS = -lsmb_server
+LDFLAGS = $(LIBRARY_SMB_SERVER_OUTPUT)
# End SUBSYSTEM SMB2_PROTOCOL
#######################
More information about the samba-cvs
mailing list