r15370: Fix more dependencies for shared libs

source/build/smb_build/input.pm

@@ -71,6 +71,7 @@ sub check_module($$$)
 
 	if ($mod->{OUTPUT_TYPE} eq "SHARED_LIBRARY") {
 		$mod->{INSTALLDIR} = "MODULESDIR/$mod->{SUBSYSTEM}";
+		push (@{$mod->{PRIVATE_DEPENDENCIES}}, $mod->{SUBSYSTEM});
 	} else { 
 		push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION});
 	}

source/lib/ldb/tools/cmdline.c

@@ -44,7 +44,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const
 #ifdef _SAMBA_BUILD_
 	int r;
 #endif
-        int num_options = 0;
+    int num_options = 0;
 	int opt;
 	struct poptOption popt_options[] = {
 		POPT_AUTOHELP

source/lib/ldb/tools/ldbdel.c

@@ -73,7 +73,7 @@ static void usage(void)
 	exit(1);
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	struct ldb_context *ldb;
 	int ret, i;

source/lib/ldb/tools/ldbedit.c

@@ -272,7 +272,7 @@ static void usage(void)
 	exit(1);
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	struct ldb_context *ldb;
 	struct ldb_result *result = NULL;

source/lib/ldb/tools/ldbmodify.c

@@ -84,7 +84,7 @@ static int process_file(struct ldb_context *ldb, FILE *f)
 	return count;
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	struct ldb_context *ldb;
 	int count=0;

source/lib/ldb/tools/ldbrename.c

@@ -51,7 +51,7 @@ static void usage(void)
 }
 
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	struct ldb_context *ldb;
 	int ret;

source/lib/ldb/tools/ldbtest.c

@@ -371,7 +371,7 @@ static void usage(void)
 	exit(1);
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	struct ldb_context *ldb;

source/lib/registry/tools/regpatch.c

@@ -42,13 +42,13 @@ int main(int argc, char **argv)
 		POPT_TABLEEND
 	};
 
-	registry_init();
-
 	pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);
 
 	while((opt = poptGetNextOpt(pc)) != -1) {
 	}
 
+	registry_init();
+
 	if (remote) {
 		error = reg_open_remote (&h, NULL, cmdline_credentials, remote, NULL);
 	} else {

source/lib/registry/tools/regshell.c

@@ -418,13 +418,13 @@ static char **reg_completion(const char *text, int start, int end)
 		POPT_TABLEEND
 	};
 
-	registry_init();
-
 	pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);
 	
 	while((opt = poptGetNextOpt(pc)) != -1) {
 	}
 
+	registry_init();
+
 	if (remote) {
 		error = reg_open_remote (&h, NULL, cmdline_credentials, remote, NULL); 
 	} else if (backend) {

source/nbt_server/config.mk

@@ -68,6 +68,6 @@ OBJ_FILES = \
 		irpc.o
 PRIVATE_PROTO_HEADER = nbt_server_proto.h
 PUBLIC_DEPENDENCIES = \
-		LIBCLI_NBT NBTD_WINS NBTD_DGRAM process_model
+		LIBCLI_NBT NBTD_WINS NBTD_DGRAM process_model service
 # End SUBSYSTEM NBTD
 #######################

source/ntptr/config.mk

@@ -8,7 +8,7 @@ SUBSYSTEM = ntptr
 OBJ_FILES = \
 		simple_ldb/ntptr_simple_ldb.o
 PUBLIC_DEPENDENCIES = \
-		ldb
+		ldb NDR_SPOOLSS
 # End MODULE ntptr_simple_ldb
 ################################################
 

source/rpc_server/config.mk

@@ -37,7 +37,7 @@ INIT_FUNCTION = dcerpc_server_rpcecho_init
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		echo/rpc_echo.o
-PUBLIC_DEPENDENCIES = NDR_ECHO
+PUBLIC_DEPENDENCIES = NDR_ECHO 
 # End MODULE dcerpc_rpcecho
 ################################################
 
@@ -218,7 +218,8 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_AUTH \
 		LIBNDR \
-		dcerpc
+		dcerpc \
+		service
 #
 # End SUBSYSTEM DCERPC
 ################################################

source/smb_server/config.mk

@@ -18,7 +18,8 @@ PRIVATE_PROTO_HEADER = smb_server_proto.h
 PUBLIC_DEPENDENCIES = \
 		LIBPACKET \
 		SMB_PROTOCOL \
-		SMB2_PROTOCOL
+		SMB2_PROTOCOL \
+		service
 # End SUBSYSTEM SMB
 #######################
 

source/web_server/config.mk

@@ -9,6 +9,6 @@ PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		web_server.o \
 		http.o
-PUBLIC_DEPENDENCIES = ESP LIBTLS smbcalls process_model
+PUBLIC_DEPENDENCIES = ESP LIBTLS smbcalls process_model service
 # End SUBSYSTEM WEB
 #######################

source/winbind/config.mk

@@ -24,7 +24,7 @@ OBJ_FILES = \
 		wb_cmd_list_trustdom.o \
 		wb_pam_auth.o
 PUBLIC_DEPENDENCIES = WB_HELPER RPC_NDR_LSA RPC_NDR_SAMR process_model \
-					  PAM_ERRORS
+					  PAM_ERRORS service
 # End SUBSYSTEM WINBIND
 #######################
 

source/wrepl_server/config.mk

@@ -17,6 +17,6 @@ OBJ_FILES = \
 		wrepl_out_helpers.o
 PRIVATE_PROTO_HEADER = wrepl_server_proto.h
 PUBLIC_DEPENDENCIES = \
-		LIBCLI_WREPL WINSDB process_model
+		LIBCLI_WREPL WINSDB process_model service
 # End SUBSYSTEM WREPL_SRV
 #######################