r15313: Fix some dependencies in dso mode

(This used to be commit f0afe9e2ff16515df1b3226b479b19ea3e9c3d0c)

11 files changed, 20 insertions, 15 deletions

diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index 9a7ace6ab5..4d6d07c743 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 SOCKET
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET LIBCLI_RESOLVE
 PRIVATE_DEPENDENCIES = ASN1_UTIL HEIMDAL_ROKEN_ADDRINFO auth_sam
 # End SUBSYSTEM KERBEROS
 #################################
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 8f7e5e4838..0bef89bb5e 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -117,6 +117,8 @@ sub import_integrated($$)
 	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");
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index bf12de628f..e6865d5e60 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -240,6 +240,7 @@ sub SharedLibrary($$)
 		}
 	}
 
+	$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 @@ sub StaticLibrary($$)
 
 	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");
 
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index 5d7029b77a..d31fe6d1df 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -7,7 +7,7 @@ include samdb/ldb_modules/config.mk
 [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 \
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index f6215a3072..8527437093 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -355,7 +355,8 @@ PUBLIC_DEPENDENCIES = \
 			HEIMDAL_ROKEN_INET_ATON \
 			HEIMDAL_ROKEN_GETPROGNAME \
 			GAI \
-			NSL
+			NSL \
+			LIBREPLACE
 # End SUBSYSTEM HEIMDAL_ROKEN
 #######################
 
@@ -484,7 +485,7 @@ SO_VERSION = 0
 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
 #######################
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 4ef7f30ab4..3862d4239e 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -41,7 +41,7 @@ OBJ_FILES = \
 		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
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index e0bb50647d..6e7f8b70e3 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -53,8 +53,8 @@ OBJ_FILES = \
 	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 @@ SO_VERSION = 0
 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 @@ PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
 	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 @@ OBJ_FILES = clireadwrite.o \
 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 \
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index ec5c48b48c..167a07eddd 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 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
 #################################
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 51057b5a0a..0719804aca 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -605,11 +605,11 @@ OBJ_FILES = \
 		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
 ################################################
 
diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk
index 8420a08cc2..b8dc023c39 100644
--- a/source4/smb_server/smb/config.mk
+++ b/source4/smb_server/smb/config.mk
@@ -16,6 +16,6 @@ OBJ_FILES = \
 		signing.o
 PUBLIC_DEPENDENCIES = \
 		ntvfs LIBPACKET
-LDFLAGS = -lsmb_server
+LDFLAGS = $(LIBRARY_SMB_SERVER_OUTPUT)
 # End SUBSYSTEM SMB_PROTOCOL
 #######################
diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk
index 62123b16bc..ad8f9829d7 100644
--- a/source4/smb_server/smb2/config.mk
+++ b/source4/smb_server/smb2/config.mk
@@ -11,6 +11,6 @@ OBJ_FILES = \
 		keepalive.o
 PUBLIC_DEPENDENCIES = \
 		ntvfs LIBPACKET LIBCLI_SMB2
-LDFLAGS = -lsmb_server
+LDFLAGS = $(LIBRARY_SMB_SERVER_OUTPUT)
 # End SUBSYSTEM SMB2_PROTOCOL
 #######################