Author: jelmer Date: 2007-11-16 23:24:23 +0000 (Fri, 16 Nov 2007) New Revision: 26006
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26006 Log: Improve some dependencies. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/auth/auth_unix.c branches/SAMBA_4_0/source/auth/config.mk branches/SAMBA_4_0/source/dsdb/config.mk branches/SAMBA_4_0/source/librpc/config.mk branches/SAMBA_4_0/source/param/config.mk branches/SAMBA_4_0/source/scripting/ejs/config.mk branches/SAMBA_4_0/source/smbd/config.mk branches/SAMBA_4_0/source/utils/config.mk Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/auth/auth_unix.c =================================================================== --- branches/SAMBA_4_0/source/auth/auth_unix.c 2007-11-16 21:50:31 UTC (rev 26005) +++ branches/SAMBA_4_0/source/auth/auth_unix.c 2007-11-16 23:24:23 UTC (rev 26006) @@ -236,7 +236,7 @@ pam_error = pam_start("samba", account_name, pconv, pamh); if (pam_error != PAM_SUCCESS) { - /* no vaild pamh here, can we reliably call pam_strerror ? */ + /* no valid pamh here, can we reliably call pam_strerror ? */ DEBUG(4,("smb_pam_start: pam_start failed!\n")); return NT_STATUS_UNSUCCESSFUL; } Modified: branches/SAMBA_4_0/source/auth/config.mk =================================================================== --- branches/SAMBA_4_0/source/auth/config.mk 2007-11-16 21:50:31 UTC (rev 26005) +++ branches/SAMBA_4_0/source/auth/config.mk 2007-11-16 23:24:23 UTC (rev 26006) @@ -49,15 +49,11 @@ # End MODULE auth_developer ####################### -####################### -# Start MODULE auth_unix [MODULE::auth_unix] INIT_FUNCTION = auth_unix_init SUBSYSTEM = auth OBJ_FILES = auth_unix.o PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER -# End MODULE auth_unix -####################### [SUBSYSTEM::PAM_ERRORS] PRIVATE_PROTO_HEADER = pam_errors.h Modified: branches/SAMBA_4_0/source/dsdb/config.mk =================================================================== --- branches/SAMBA_4_0/source/dsdb/config.mk 2007-11-16 21:50:31 UTC (rev 26005) +++ branches/SAMBA_4_0/source/dsdb/config.mk 2007-11-16 23:24:23 UTC (rev 26006) @@ -8,7 +8,7 @@ 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 +PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER OBJ_FILES = \ samdb/samdb.o \ samdb/samdb_privilege.o \ Modified: branches/SAMBA_4_0/source/librpc/config.mk =================================================================== --- branches/SAMBA_4_0/source/librpc/config.mk 2007-11-16 21:50:31 UTC (rev 26005) +++ branches/SAMBA_4_0/source/librpc/config.mk 2007-11-16 23:24:23 UTC (rev 26006) @@ -27,7 +27,8 @@ LIBSAMBA-UTIL \ LIBPOPT \ POPT_SAMBA \ - NDR_TABLE + NDR_TABLE \ + LIBSAMBA-ERRORS MANPAGE = tools/ndrdump.1 # FIXME: ndrdump shouldn't have to depend on RPC... # End BINARY ndrdump Modified: branches/SAMBA_4_0/source/param/config.mk =================================================================== --- branches/SAMBA_4_0/source/param/config.mk 2007-11-16 21:50:31 UTC (rev 26005) +++ branches/SAMBA_4_0/source/param/config.mk 2007-11-16 23:24:23 UTC (rev 26006) @@ -47,4 +47,4 @@ [SUBSYSTEM::SECRETS] OBJ_FILES = secrets.o -PRIVATE_DEPENDENCIES = LDB_WRAP UTIL_TDB +PRIVATE_DEPENDENCIES = LDB_WRAP TDB_WRAP UTIL_TDB Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk =================================================================== --- branches/SAMBA_4_0/source/scripting/ejs/config.mk 2007-11-16 21:50:31 UTC (rev 26005) +++ branches/SAMBA_4_0/source/scripting/ejs/config.mk 2007-11-16 23:24:23 UTC (rev 26006) @@ -8,11 +8,13 @@ [MODULE::smbcalls_config] OBJ_FILES = smbcalls_config.o +OUTPUT_TYPE = INTEGRATED SUBSYSTEM = smbcalls INIT_FUNCTION = smb_setup_ejs_config [MODULE::smbcalls_ldb] OBJ_FILES = smbcalls_ldb.o +OUTPUT_TYPE = INTEGRATED SUBSYSTEM = smbcalls INIT_FUNCTION = smb_setup_ejs_ldb PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR @@ -20,38 +22,45 @@ [MODULE::smbcalls_reg] OBJ_FILES = smbcalls_reg.o SUBSYSTEM = smbcalls +OUTPUT_TYPE = INTEGRATED INIT_FUNCTION = smb_setup_ejs_reg PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR [MODULE::smbcalls_nbt] OBJ_FILES = smbcalls_nbt.o SUBSYSTEM = smbcalls +OUTPUT_TYPE = INTEGRATED INIT_FUNCTION = smb_setup_ejs_nbt [MODULE::smbcalls_samba3] OBJ_FILES = smbcalls_samba3.o SUBSYSTEM = smbcalls +OUTPUT_TYPE = INTEGRATED INIT_FUNCTION = smb_setup_ejs_samba3 PRIVATE_DEPENDENCIES = LIBSAMBA3 [MODULE::smbcalls_rand] OBJ_FILES = smbcalls_rand.o SUBSYSTEM = smbcalls +OUTPUT_TYPE = INTEGRATED INIT_FUNCTION = smb_setup_ejs_random [MODULE::smbcalls_nss] OBJ_FILES = smbcalls_nss.o SUBSYSTEM = smbcalls +OUTPUT_TYPE = INTEGRATED INIT_FUNCTION = smb_setup_ejs_nss PRIVATE_DEPENDENCIES = NSS_WRAPPER [MODULE::smbcalls_data] OBJ_FILES = smbcalls_data.o SUBSYSTEM = smbcalls +OUTPUT_TYPE = INTEGRATED INIT_FUNCTION = smb_setup_ejs_datablob [MODULE::smbcalls_auth] OBJ_FILES = smbcalls_auth.o +OUTPUT_TYPE = INTEGRATED SUBSYSTEM = smbcalls INIT_FUNCTION = smb_setup_ejs_auth PRIVATE_DEPENDENCIES = auth @@ -59,11 +68,13 @@ [MODULE::smbcalls_string] OBJ_FILES = smbcalls_string.o SUBSYSTEM = smbcalls +OUTPUT_TYPE = INTEGRATED INIT_FUNCTION = smb_setup_ejs_string [MODULE::smbcalls_sys] OBJ_FILES = smbcalls_sys.o SUBSYSTEM = smbcalls +OUTPUT_TYPE = INTEGRATED INIT_FUNCTION = smb_setup_ejs_system include ejsnet/config.mk Modified: branches/SAMBA_4_0/source/smbd/config.mk =================================================================== --- branches/SAMBA_4_0/source/smbd/config.mk 2007-11-16 21:50:31 UTC (rev 26005) +++ branches/SAMBA_4_0/source/smbd/config.mk 2007-11-16 23:24:23 UTC (rev 26006) @@ -19,7 +19,7 @@ service_stream.o \ service_task.o PRIVATE_DEPENDENCIES = \ - MESSAGING + MESSAGING samba-socket # End SUBSYSTEM SERVER ####################### Modified: branches/SAMBA_4_0/source/utils/config.mk =================================================================== --- branches/SAMBA_4_0/source/utils/config.mk 2007-11-16 21:50:31 UTC (rev 26005) +++ branches/SAMBA_4_0/source/utils/config.mk 2007-11-16 23:24:23 UTC (rev 26006) @@ -32,7 +32,8 @@ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ NDR_XATTR \ - WRAP_XATTR + WRAP_XATTR \ + LIBSAMBA-ERRORS # End BINARY getntacl #################################
