r23487: fix the build with automatic dependencies

metze
(This used to be commit ebf8cd09c3a4e32e824e31178330dde2d867f5e1)

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 5ab270cf184c5957e807280cf7037f2724838149..a13a8741013f1e066cd42878a4a4ccf10ea13bb5 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -296,7 +296,7 @@ OBJ_FILES = \
 #######################
 
 [SUBSYSTEM::HEIMDAL_HCRYPTO]
-CFLAGS = -Iheimdal_build -Iheimdal/lib/hcrypto
+CFLAGS = -Iheimdal_build -Iheimdal/lib/hcrypto -Iheimdal/lib
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1
 OBJ_FILES = \
        ../heimdal/lib/hcrypto/aes.o \
@@ -575,14 +575,8 @@ include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et heimdal/lib
 include perl_path_wrapper.sh et_deps.pl heimdal/lib/gssapi/krb5/gkrb5_err.et heimdal/lib/gssapi|
 include perl_path_wrapper.sh et_deps.pl heimdal/lib/hx509/hx509_err.et heimdal/lib/hx509|
 
-include perl_path_wrapper.sh hcrypto-deps.pl heimdal/lib/hcrypto/*.h|
-
-heimdal/lib/hcrypto/hcrypto:
-       @rm -f $@; ln -s ./../hcrypto $@
-
 clean::        
        @-rm -f bin/compile_et bin/asn1_compile
-       @-rm -f heimdal/lib/krb5/hcrypto/hcrypto
 
 #######################
 # Start SUBSYSTEM HEIMDAL

diff --git a/source4/heimdal_build/hcrypto-deps.pl b/source4/heimdal_build/hcrypto-deps.pl
deleted file mode 100755 (executable)
index 0a2bba1..0000000
--- a/source4/heimdal_build/hcrypto-deps.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/perl
-use strict;
-
-foreach (@ARGV) {
-       my $old = $_;
-       my $new = $old; $new =~ s/hcrypto/hcrypto\/hcrypto/g;
-       my $dir = $old; 
-       print "$new: heimdal/lib/hcrypto/hcrypto\n";
-}