Author: jelmer Date: 2006-05-01 01:34:04 +0000 (Mon, 01 May 2006) New Revision: 15370
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15370 Log: Fix more dependencies for shared libs Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c branches/SAMBA_4_0/source/lib/ldb/tools/ldbdel.c branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c branches/SAMBA_4_0/source/lib/ldb/tools/ldbmodify.c branches/SAMBA_4_0/source/lib/ldb/tools/ldbrename.c branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c branches/SAMBA_4_0/source/lib/registry/tools/regshell.c branches/SAMBA_4_0/source/nbt_server/config.mk branches/SAMBA_4_0/source/ntptr/config.mk branches/SAMBA_4_0/source/rpc_server/config.mk branches/SAMBA_4_0/source/smb_server/config.mk branches/SAMBA_4_0/source/web_server/config.mk branches/SAMBA_4_0/source/winbind/config.mk branches/SAMBA_4_0/source/wrepl_server/config.mk Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-05-01 01:34:04 UTC (rev 15370) @@ -71,6 +71,7 @@ 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}); } Modified: branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c 2006-05-01 01:34:04 UTC (rev 15370) @@ -44,7 +44,7 @@ #ifdef _SAMBA_BUILD_ int r; #endif - int num_options = 0; + int num_options = 0; int opt; struct poptOption popt_options[] = { POPT_AUTOHELP Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbdel.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/tools/ldbdel.c 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbdel.c 2006-05-01 01:34:04 UTC (rev 15370) @@ -73,7 +73,7 @@ exit(1); } - int main(int argc, const char **argv) +int main(int argc, const char **argv) { struct ldb_context *ldb; int ret, i; Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c 2006-05-01 01:34:04 UTC (rev 15370) @@ -272,7 +272,7 @@ 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; Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbmodify.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/tools/ldbmodify.c 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbmodify.c 2006-05-01 01:34:04 UTC (rev 15370) @@ -84,7 +84,7 @@ return count; } - int main(int argc, const char **argv) +int main(int argc, const char **argv) { struct ldb_context *ldb; int count=0; Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbrename.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/tools/ldbrename.c 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbrename.c 2006-05-01 01:34:04 UTC (rev 15370) @@ -51,7 +51,7 @@ } - int main(int argc, const char **argv) +int main(int argc, const char **argv) { struct ldb_context *ldb; int ret; Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c 2006-05-01 01:34:04 UTC (rev 15370) @@ -371,7 +371,7 @@ 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; Modified: branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c =================================================================== --- branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2006-05-01 01:34:04 UTC (rev 15370) @@ -42,13 +42,13 @@ 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 { Modified: branches/SAMBA_4_0/source/lib/registry/tools/regshell.c =================================================================== --- branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2006-05-01 01:34:04 UTC (rev 15370) @@ -418,13 +418,13 @@ 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) { Modified: branches/SAMBA_4_0/source/nbt_server/config.mk =================================================================== --- branches/SAMBA_4_0/source/nbt_server/config.mk 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/nbt_server/config.mk 2006-05-01 01:34:04 UTC (rev 15370) @@ -68,6 +68,6 @@ 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 ####################### Modified: branches/SAMBA_4_0/source/ntptr/config.mk =================================================================== --- branches/SAMBA_4_0/source/ntptr/config.mk 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/ntptr/config.mk 2006-05-01 01:34:04 UTC (rev 15370) @@ -8,7 +8,7 @@ OBJ_FILES = \ simple_ldb/ntptr_simple_ldb.o PUBLIC_DEPENDENCIES = \ - ldb + ldb NDR_SPOOLSS # End MODULE ntptr_simple_ldb ################################################ Modified: branches/SAMBA_4_0/source/rpc_server/config.mk =================================================================== --- branches/SAMBA_4_0/source/rpc_server/config.mk 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/rpc_server/config.mk 2006-05-01 01:34:04 UTC (rev 15370) @@ -37,7 +37,7 @@ 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 @@ PUBLIC_DEPENDENCIES = \ LIBCLI_AUTH \ LIBNDR \ - dcerpc + dcerpc \ + service # # End SUBSYSTEM DCERPC ################################################ Modified: branches/SAMBA_4_0/source/smb_server/config.mk =================================================================== --- branches/SAMBA_4_0/source/smb_server/config.mk 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/smb_server/config.mk 2006-05-01 01:34:04 UTC (rev 15370) @@ -18,7 +18,8 @@ PUBLIC_DEPENDENCIES = \ LIBPACKET \ SMB_PROTOCOL \ - SMB2_PROTOCOL + SMB2_PROTOCOL \ + service # End SUBSYSTEM SMB ####################### Modified: branches/SAMBA_4_0/source/web_server/config.mk =================================================================== --- branches/SAMBA_4_0/source/web_server/config.mk 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/web_server/config.mk 2006-05-01 01:34:04 UTC (rev 15370) @@ -9,6 +9,6 @@ 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 ####################### Modified: branches/SAMBA_4_0/source/winbind/config.mk =================================================================== --- branches/SAMBA_4_0/source/winbind/config.mk 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/winbind/config.mk 2006-05-01 01:34:04 UTC (rev 15370) @@ -24,7 +24,7 @@ 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 ####################### Modified: branches/SAMBA_4_0/source/wrepl_server/config.mk =================================================================== --- branches/SAMBA_4_0/source/wrepl_server/config.mk 2006-05-01 00:01:25 UTC (rev 15369) +++ branches/SAMBA_4_0/source/wrepl_server/config.mk 2006-05-01 01:34:04 UTC (rev 15370) @@ -17,6 +17,6 @@ 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 #######################
