Author: jelmer Date: 2007-11-17 00:18:20 +0000 (Sat, 17 Nov 2007) New Revision: 26007
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26007 Log: Fix some dependencies. Modified: branches/4.0-python/ branches/4.0-python/source/auth/credentials/config.mk branches/4.0-python/source/auth/kerberos/config.mk branches/4.0-python/source/build/smb_build/input.pm branches/4.0-python/source/build/smb_build/main.pl branches/4.0-python/source/build/smb_build/makefile.pm branches/4.0-python/source/dsdb/config.mk branches/4.0-python/source/dsdb/samdb/ldb_modules/config.mk branches/4.0-python/source/dsdb/samdb/ldb_modules/entryUUID.c branches/4.0-python/source/lib/ldb/config.mk branches/4.0-python/source/lib/nss_wrapper/config.mk branches/4.0-python/source/lib/samba3/config.mk branches/4.0-python/source/nbt_server/config.mk Changeset: Property changes on: branches/4.0-python ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/4.0-python/source/auth/credentials/config.mk =================================================================== --- branches/4.0-python/source/auth/credentials/config.mk 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/auth/credentials/config.mk 2007-11-17 00:18:20 UTC (rev 26007) @@ -19,6 +19,6 @@ PUBLIC_HEADERS = credentials_krb5.h OBJ_FILES = credentials_krb5.o PUBLIC_DEPENDENCIES = \ - HEIMDAL_GSSAPI + HEIMDAL_GSSAPI KERBEROS # End SUBSYSTEM CREDENTIALS ################################# Modified: branches/4.0-python/source/auth/kerberos/config.mk =================================================================== --- branches/4.0-python/source/auth/kerberos/config.mk 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/auth/kerberos/config.mk 2007-11-17 00:18:20 UTC (rev 26007) @@ -10,6 +10,6 @@ gssapi_parse.o \ krb5_init_context.o PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE -PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam CREDENTIALS_KRB5 +PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam # End SUBSYSTEM KERBEROS ################################# Modified: branches/4.0-python/source/build/smb_build/input.pm =================================================================== --- branches/4.0-python/source/build/smb_build/input.pm 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/build/smb_build/input.pm 2007-11-17 00:18:20 UTC (rev 26007) @@ -116,7 +116,9 @@ return if ($lib->{ENABLE} ne "YES"); - $lib->{OUTPUT_TYPE} = $default_ot; + unless (defined($lib->{OUTPUT_TYPE})) { + $lib->{OUTPUT_TYPE} = $default_ot; + } if (defined($lib->{VERSION}) and not defined($lib->{SO_VERSION})) { print "$lib->{NAME}: Please specify SO_VERSION when specifying VERSION\n"; @@ -142,9 +144,6 @@ { my ($INPUT, $python) = @_; - return if ($python->{ENABLE} ne "YES"); - - $python->{OUTPUT_TYPE} = ["SHARED_LIBRARY"]; $python->{INSTALLDIR} = "PYTHONDIR"; push (@{$python->{PUBLIC_DEPENDENCIES}}, "LIBPYTHON"); if (defined($python->{SWIG_FILE})) { Modified: branches/4.0-python/source/build/smb_build/main.pl =================================================================== --- branches/4.0-python/source/build/smb_build/main.pl 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/build/smb_build/main.pl 2007-11-17 00:18:20 UTC (rev 26007) @@ -60,7 +60,8 @@ $mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->PkgConfig($key, $OUTPUT) if $key->{TYPE} eq "LIBRARY" and defined($key->{VERSION}); - $mkenv->SharedLibrary($key) if $key->{TYPE} eq "LIBRARY" and + $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY" or + $key->{TYPE} eq "PYTHON") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->SharedModule($key) if $key->{TYPE} eq "MODULE" and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); Modified: branches/4.0-python/source/build/smb_build/makefile.pm =================================================================== --- branches/4.0-python/source/build/smb_build/makefile.pm 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/build/smb_build/makefile.pm 2007-11-17 00:18:20 UTC (rev 26007) @@ -322,9 +322,6 @@ $self->{install_plugins} .= "[EMAIL PROTECTED] -fs $ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(MODULESDIR)/$sane_subsystem/$_.\$(SHLIBEXT)\n"; $self->{uninstall_plugins} .= "[EMAIL PROTECTED] \$(DESTDIR)\$(MODULESDIR)/$sane_subsystem/$_.\$(SHLIBEXT)\n"; } - } elsif ($ctx->{TYPE} eq "PYTHON") { - push (@{$self->{python_dsos}}, - "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}"); } $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); @@ -397,6 +394,12 @@ $self->_prepare_list($ctx, "LINK_FLAGS"); # $self->_prepare_list_ex($ctx, "LINK_FLAGS", "-Wl,--whole-archive", "-Wl,--no-whole-archive"); + if ($ctx->{TYPE} eq "PYTHON") { + print "PYTHON: $ctx->{TYPE}\n"; + push (@{$self->{python_dsos}}, + "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}"); + } + push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)"); my $soarg = ""; Modified: branches/4.0-python/source/dsdb/config.mk =================================================================== --- branches/4.0-python/source/dsdb/config.mk 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/dsdb/config.mk 2007-11-17 00:18:20 UTC (rev 26007) @@ -7,8 +7,8 @@ [SUBSYSTEM::SAMDB] PUBLIC_PROTO_HEADER = samdb/samdb_proto.h PUBLIC_HEADERS = samdb/samdb.h -PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5 -PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS +PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5 +PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS LDFLAGS = $(LIBRARY_ldb_OUTPUT) OBJ_FILES = \ samdb/samdb.o \ @@ -16,10 +16,15 @@ samdb/cracknames.o \ common/sidmap.o \ common/flag_mapping.o \ + repl/replicated_objects.o + + +[SUBSYSTEM::SAMDB_SCHEMA] +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL NDR_DRSUAPI NDR_DRSBLOBS SAMDB +OBJ_FILES = \ schema/schema_init.o \ schema/schema_syntax.o \ - schema/schema_constructed.o \ - repl/replicated_objects.o + schema/schema_constructed.o # # End SUBSYSTEM SAMDB ################################################ Modified: branches/4.0-python/source/dsdb/samdb/ldb_modules/config.mk =================================================================== --- branches/4.0-python/source/dsdb/samdb/ldb_modules/config.mk 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/dsdb/samdb/ldb_modules/config.mk 2007-11-17 00:18:20 UTC (rev 26007) @@ -3,7 +3,7 @@ [MODULE::ldb_objectguid] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC +PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC LIBLDB INIT_FUNCTION = objectguid_module_init OBJ_FILES = \ objectguid.o @@ -15,7 +15,7 @@ [MODULE::ldb_repl_meta_data] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS +PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS LIBLDB INIT_FUNCTION = repl_meta_data_module_init OBJ_FILES = \ repl_meta_data.o @@ -27,7 +27,7 @@ [MODULE::ldb_dsdb_cache] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC +PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBLDB INIT_FUNCTION = dsdb_cache_module_init OBJ_FILES = \ dsdb_cache.o @@ -39,7 +39,7 @@ [MODULE::ldb_schema_fsmo] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC +PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBLDB INIT_FUNCTION = schema_fsmo_module_init OBJ_FILES = \ schema_fsmo.o @@ -51,7 +51,7 @@ [MODULE::ldb_naming_fsmo] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC +PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBLDB INIT_FUNCTION = naming_fsmo_module_init OBJ_FILES = \ naming_fsmo.o @@ -63,7 +63,7 @@ [MODULE::ldb_pdc_fsmo] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC +PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBLDB INIT_FUNCTION = pdc_fsmo_module_init OBJ_FILES = \ pdc_fsmo.o @@ -75,7 +75,7 @@ [MODULE::ldb_samldb] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = LIBTALLOC NDR_SECURITY +PRIVATE_DEPENDENCIES = LIBTALLOC NDR_SECURITY LIBLDB SAMDB INIT_FUNCTION = samldb_module_init OBJ_FILES = \ samldb.o @@ -89,7 +89,8 @@ SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY INIT_FUNCTION = ldb_samba3sam_module_init -PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD NSS_WRAPPER +PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD NSS_WRAPPER NDR_SECURITY \ + LIBLDB OBJ_FILES = \ samba3sam.o # @@ -98,11 +99,11 @@ ################################################ # Start MODULE ldb_entryUUID -[MODULE::ldb_entryUUID] +[MODULE::ldb_entryuuid] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY INIT_FUNCTION = ldb_entryUUID_module_init -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC NDR_MISC LIBLDB ldb_map ENABLE = YES OBJ_FILES = \ entryUUID.o @@ -126,7 +127,7 @@ # Start MODULE ldb_rootdse [MODULE::ldb_rootdse] SUBSYSTEM = LIBLDB -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC LIBLDB SAMDB_SCHEMA OUTPUT_TYPE = SHARED_LIBRARY INIT_FUNCTION = rootdse_module_init OBJ_FILES = \ @@ -142,7 +143,8 @@ OUTPUT_TYPE = SHARED_LIBRARY INIT_FUNCTION = password_hash_module_init OBJ_FILES = password_hash.o -PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 NDR_DRSBLOBS +PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 NDR_DRSBLOBS \ + LIBLDB SAMDB # # End MODULE ldb_password_hash ################################################ @@ -150,7 +152,7 @@ ################################################ # Start MODULE ldb_local_password [MODULE::ldb_local_password] -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC LIBLDB NDR_MISC SAMDB OUTPUT_TYPE = SHARED_LIBRARY SUBSYSTEM = LIBLDB INIT_FUNCTION = local_password_module_init @@ -162,7 +164,7 @@ ################################################ # Start MODULE ldb_kludge_acl [MODULE::ldb_kludge_acl] -PRIVATE_DEPENDENCIES = LIBTALLOC LIBSECURITY +PRIVATE_DEPENDENCIES = LIBTALLOC LIBSECURITY LIBLDB SAMDB_SCHEMA OUTPUT_TYPE = SHARED_LIBRARY SUBSYSTEM = LIBLDB INIT_FUNCTION = ldb_kludge_acl_init @@ -177,7 +179,7 @@ [MODULE::ldb_extended_dn] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC LIBLDB LIBSECURITY SAMDB INIT_FUNCTION = ldb_extended_dn_init OBJ_FILES = \ extended_dn.o @@ -190,7 +192,7 @@ [MODULE::ldb_show_deleted] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC LIBLDB INIT_FUNCTION = ldb_show_deleted_init OBJ_FILES = \ show_deleted.o @@ -203,7 +205,7 @@ [MODULE::ldb_partition] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC LIBLDB SAMDB INIT_FUNCTION = ldb_partition_init OBJ_FILES = \ partition.o @@ -216,7 +218,7 @@ [MODULE::ldb_schema] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC LIBLDB INIT_FUNCTION = ldb_schema_init OBJ_FILES = \ schema.o schema_syntax.o @@ -229,8 +231,7 @@ [MODULE::ldb_update_keytab] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = LIBTALLOC CREDENTIALS_KRB5 -#Also depends on credentials, but that would loop +PRIVATE_DEPENDENCIES = LIBTALLOC CREDENTIALS_KRB5 LIBLDB CREDENTIALS INIT_FUNCTION = ldb_update_kt_init OBJ_FILES = \ update_keytab.o @@ -244,7 +245,7 @@ INIT_FUNCTION = ldb_objectclass_init OUTPUT_TYPE = SHARED_LIBRARY CFLAGS = -Ilib/ldb/include -PRIVATE_DEPENDENCIES = LIBTALLOC NDR_SECURITY +PRIVATE_DEPENDENCIES = LIBTALLOC NDR_SECURITY LIBLDB SAMDB_SCHEMA SUBSYSTEM = LIBLDB OBJ_FILES = \ objectclass.o @@ -257,7 +258,7 @@ INIT_FUNCTION = ldb_subtree_rename_init OUTPUT_TYPE = SHARED_LIBRARY CFLAGS = -Ilib/ldb/include -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC LIBLDB SUBSYSTEM = LIBLDB OBJ_FILES = \ subtree_rename.o @@ -270,7 +271,7 @@ INIT_FUNCTION = ldb_subtree_delete_init OUTPUT_TYPE = SHARED_LIBRARY CFLAGS = -Ilib/ldb/include -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC LIBLDB SUBSYSTEM = LIBLDB OBJ_FILES = \ subtree_delete.o @@ -283,7 +284,7 @@ INIT_FUNCTION = ldb_linked_attributes_init CFLAGS = -Ilib/ldb/include OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB +PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB LIBLDB SUBSYSTEM = LIBLDB OBJ_FILES = \ linked_attributes.o Modified: branches/4.0-python/source/dsdb/samdb/ldb_modules/entryUUID.c =================================================================== --- branches/4.0-python/source/dsdb/samdb/ldb_modules/entryUUID.c 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/dsdb/samdb/ldb_modules/entryUUID.c 2007-11-17 00:18:20 UTC (rev 26007) @@ -784,7 +784,7 @@ } static struct ldb_module_ops entryUUID_ops = { - .name = "entryUUID", + .name = "entryuuid", .init_context = entryUUID_init, .sequence_number = entryUUID_sequence_number }; Modified: branches/4.0-python/source/lib/ldb/config.mk =================================================================== --- branches/4.0-python/source/lib/ldb/config.mk 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/lib/ldb/config.mk 2007-11-17 00:18:20 UTC (rev 26007) @@ -128,6 +128,7 @@ [LIBRARY::LIBLDB] VERSION = 0.0.1 SO_VERSION = 0 +OUTPUT_TYPE = SHARED_LIBRARY CFLAGS = -Ilib/ldb/include DESCRIPTION = LDAP-like embedded database library INIT_FUNCTION_TYPE = int (*) (void) Modified: branches/4.0-python/source/lib/nss_wrapper/config.mk =================================================================== --- branches/4.0-python/source/lib/nss_wrapper/config.mk 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/lib/nss_wrapper/config.mk 2007-11-17 00:18:20 UTC (rev 26007) @@ -6,5 +6,6 @@ DESCRIPTION = Wrapper library for testing nss calls without being root PUBLIC_HEADERS = nss_wrapper.h OBJ_FILES = nss_wrapper.o +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL # End SUBSYSTEM NSS_WRAPPER ############################## Modified: branches/4.0-python/source/lib/samba3/config.mk =================================================================== --- branches/4.0-python/source/lib/samba3/config.mk 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/lib/samba3/config.mk 2007-11-17 00:18:20 UTC (rev 26007) @@ -18,6 +18,7 @@ # Start SUBSYSTEM LIBSAMBA3 [SUBSYSTEM::SMBPASSWD] PRIVATE_PROTO_HEADER = samba3_smbpasswd_proto.h +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL OBJ_FILES = smbpasswd.o # End SUBSYSTEM LIBSAMBA3 ################################################ Modified: branches/4.0-python/source/nbt_server/config.mk =================================================================== --- branches/4.0-python/source/nbt_server/config.mk 2007-11-16 23:24:23 UTC (rev 26006) +++ branches/4.0-python/source/nbt_server/config.mk 2007-11-17 00:18:20 UTC (rev 26007) @@ -21,7 +21,7 @@ OBJ_FILES = \ wins/wins_ldb.o PRIVATE_DEPENDENCIES = \ - LIBNETIF + LIBNETIF LIBLDB # End MODULE ldb_wins_ldb #######################
