summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-21 23:12:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:20 -0500
commit80d4b8c14df4174f4582eca8c26d18cd4a2d447a (patch)
tree9ed4aa15b123dc9b551a4d0b8538ac850a8a3057
parentf71b2fdfe287452214de611df948e00f87281cbd (diff)
downloadsamba-80d4b8c14df4174f4582eca8c26d18cd4a2d447a.tar.gz
samba-80d4b8c14df4174f4582eca8c26d18cd4a2d447a.tar.bz2
samba-80d4b8c14df4174f4582eca8c26d18cd4a2d447a.zip
r22439: fix some dependencies
metze (This used to be commit fb2c89bf9028afa8732508f8f85bb6e30ae4c03d)
-rwxr-xr-xsource4/heimdal_build/asn1_deps.pl2
-rw-r--r--source4/heimdal_build/config.mk16
2 files changed, 12 insertions, 6 deletions
diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index aef34908d0..b45a90d416 100755
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/heimdal_build/asn1_deps.pl
@@ -46,7 +46,7 @@ foreach(<IN>) {
close(IN);
print '[SUBSYSTEM::HEIMDAL_'.uc($prefix).']'."\n";
-print "CFLAGS = -Iheimdal_build -I$dirname\n";
+print "CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -I$dirname\n";
print "OBJ_FILES = ";
foreach $o_file (@o_files) {
print "\\\n\t$o_file";
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index f04c6d39aa..fa9fe7bc96 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -54,7 +54,7 @@ PRIVATE_DEPENDENCIES = HDB_LDB HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMDAL_HDB_ASN1
#######################
# Start SUBSYSTEM HEIMDAL_GSSAPI
[SUBSYSTEM::HEIMDAL_GSSAPI]
-CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi -Iheimdal/lib/gssapi/krb5 -Iheimdal/lib/gssapi/mech
+CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi/gssapi -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi/krb5 -Iheimdal/lib/gssapi/mech
OBJ_FILES = \
../heimdal/lib/gssapi/mech/gss_krb5.o \
../heimdal/lib/gssapi/mech/gss_mech_switch.o \
@@ -163,7 +163,8 @@ OBJ_FILES = \
../heimdal/lib/gssapi/krb5/accept_sec_context.o \
../heimdal/lib/gssapi/krb5/set_sec_context_option.o \
../heimdal/lib/gssapi/krb5/process_context_token.o
-PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_ASN1 HEIMDAL_SPNEGO_ASN1
+PRIVATE_DEPENDENCIES = HEIMDAL_DES HEIMDAL_ASN1 HEIMDAL_SPNEGO_ASN1
+PUBLIC_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5
# End SUBSYSTEM HEIMDAL_GSSAPI
#######################
@@ -171,8 +172,8 @@ PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_ASN1 HEIMD
# Start SUBSYSTEM HEIMDAL_KRB5
[SUBSYSTEM::HEIMDAL_KRB5]
CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_HX509 HEIMDAL_PKINIT_ASN1 HEIMDAL_GLUE
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_PKINIT_ASN1
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509
OBJ_FILES = \
../heimdal/lib/krb5/acache.o \
../heimdal/lib/krb5/add_et_list.o \
@@ -330,7 +331,12 @@ OBJ_FILES = \
# Start SUBSYSTEM HEIMDAL_HX509
[SUBSYSTEM::HEIMDAL_HX509]
CFLAGS = -Iheimdal_build -Iheimdal/lib/hx509
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1
+PRIVATE_DEPENDENCIES = \
+ HEIMDAL_ROKEN HEIMDAL_COM_ERR \
+ HEIMDAL_ASN1 HEIMDAL_DES \
+ HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 \
+ HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 \
+ HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1
OBJ_FILES = \
../heimdal/lib/hx509/ca.o \
../heimdal/lib/hx509/cert.o \