diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-27 16:09:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:04 -0500 |
| commit | 710ea949886dd57c66dc6d397e0ea41c89736107 (patch) | |
| tree | f234adf0c7879144ef68044291753e43e028061d /source4/heimdal_build | |
| parent | 70d10653ad3dcc4c12c83d4ca14752d0a0c89fe8 (diff) | |
| download | samba-710ea949886dd57c66dc6d397e0ea41c89736107.tar.gz samba-710ea949886dd57c66dc6d397e0ea41c89736107.tar.bz2 samba-710ea949886dd57c66dc6d397e0ea41c89736107.zip | |
r15297: Move create_security_token() to samdb as it requires SAMDB (and the rest of LIBSECURITY doesn't)
Make the ldb password_hash module only depend on some keys manipulation code, not full heimdal
Some other dependency fixes
(This used to be commit 5b3ab728edfc9cdd9eee16ad0fe6dfd4b5ced630)
Diffstat (limited to 'source4/heimdal_build')
| -rw-r--r-- | source4/heimdal_build/config.mk | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 8d1b6c5781..f6215a3072 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -16,6 +16,14 @@ PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB # End SUBSYSTEM HEIMDAL_KDC ####################### +[SUBSYSTEM::HEIMDAL_HDB_KEYS] +CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb +OBJ_FILES = \ + ../heimdal/lib/hdb/keys.o \ + ../heimdal/lib/hdb/asn1_Key.o \ + ../heimdal/lib/hdb/asn1_Salt.o +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_KRB5 + ####################### # Start SUBSYSTEM HEIMDAL_HDB [SUBSYSTEM::HEIMDAL_HDB] @@ -24,7 +32,6 @@ OBJ_FILES = \ ../heimdal/lib/hdb/db.o \ ../heimdal/lib/hdb/hdb.o \ ../heimdal/lib/hdb/ext.o \ - ../heimdal/lib/hdb/keys.o \ ../heimdal/lib/hdb/keytab.o \ ../heimdal/lib/hdb/mkey.o \ ../heimdal/lib/hdb/ndbm.o \ @@ -39,11 +46,9 @@ OBJ_FILES = \ ../heimdal/lib/hdb/asn1_HDB_Ext_Password.o \ ../heimdal/lib/hdb/asn1_HDB_extension.o \ ../heimdal/lib/hdb/asn1_HDB_extensions.o \ - ../heimdal/lib/hdb/asn1_Key.o \ - ../heimdal/lib/hdb/asn1_Salt.o \ ../heimdal/lib/hdb/asn1_hdb_entry.o \ ../heimdal/lib/hdb/hdb_err.o -PUBLIC_DEPENDENCIES = HDB_LDB +PUBLIC_DEPENDENCIES = HDB_LDB HEIMDAL_HDB_KEYS HEIMDAL_ROKEN # End SUBSYSTEM HEIMDAL_HDB ####################### @@ -99,7 +104,7 @@ PUBLIC_DEPENDENCIES = KERBEROS HEIMDAL_KRB5 # Start SUBSYSTEM HEIMDAL_KRB5 [SUBSYSTEM::HEIMDAL_KRB5] CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_ASN1 +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_ASN1 HEIMDAL_GLUE OBJ_FILES = \ ../heimdal/lib/krb5/acache.o \ ../heimdal/lib/krb5/add_et_list.o \ @@ -480,7 +485,7 @@ CFLAGS = -Iheimdal_build OBJ_FILES = ../heimdal/lib/vers/print_version.o PUBLIC_DEPENDENCIES = \ LIBREPLACE HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \ - HEIMDAL_GLUE RESOLV + RESOLV # End SUBSYSTEM HEIMDAL ####################### |