r14605: Create heimdal/lib/des/hcrypto symlink if it doesn't exist

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index add98b4fdcdb47078ec522055ef783888e40f9bf..7db6367fd2074db7538c4f545f75e66ad1eed866 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -68,7 +68,7 @@ sub _prepare_path_vars($)
 prefix = $self->{config}->{prefix}
 exec_prefix = $self->{config}->{exec_prefix}
 selftest_prefix = $self->{config}->{selftest_prefix}
-VPATH = $self->{config}->{srcdir}:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb
+VPATH = $self->{config}->{srcdir}:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken
 srcdir = $self->{config}->{srcdir}
 builddir = $self->{config}->{builddir}
 

diff --git a/source/heimdal/lib/des/hcrypto b/source/heimdal/lib/des/hcrypto
deleted file mode 120000 (symlink)
index 023d458..0000000
--- a/source/heimdal/lib/des/hcrypto
+++ /dev/null
@@ -1 +0,0 @@
-./../des
\ No newline at end of file

diff --git a/source/heimdal_build/config.mk b/source/heimdal_build/config.mk
index f96aaedd3f08b125c0150bb052fc36f5257c9ef5..f1ed7943f4bd453222455fed057e2791f30072a2 100644 (file)
--- a/source/heimdal_build/config.mk
+++ b/source/heimdal_build/config.mk
@@ -428,18 +428,11 @@ include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/heim_err.et|
 include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/k524_err.et|
 include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et|
 
-./heimdal/lib/krb5/replay.c: ./heimdal/lib/roken/vis.h
-./heimdal/lib/roken/vis.c: ./heimdal/lib/roken/vis.h
+heimdal/lib/des/hcrypto/%: heimdal/lib/des/% heimdal/lib/des/hcrypto
+       @true
 
-heimdal/lib/krb5/krb5.h: heimdal/lib/asn1/asn1_err.h \
-       heimdal/lib/krb5/krb5_err.h
-
-heimdal/lib/gssapi/asn1_ContextFlags.c: heimdal/lib/gssapi/spnego_asn1.h
-heimdal/lib/gssapi/asn1_MechType.c: heimdal/lib/gssapi/spnego_asn1.h
-heimdal/lib/gssapi/asn1_MechTypeList.c: heimdal/lib/gssapi/spnego_asn1.h
-heimdal/lib/gssapi/asn1_NegTokenInit.c: heimdal/lib/gssapi/spnego_asn1.h
-heimdal/lib/gssapi/asn1_NegTokenTarg.c: heimdal/lib/gssapi/spnego_asn1.h
-heimdal/lib/gssapi/asn1_NegotiationToken.c: heimdal/lib/gssapi/spnego_asn1.h
+heimdal/lib/des/hcrypto: 
+       ln -sf ./../des $@
 
 clean::        
        @-rm -f heimdal/lib/roken/vis.h heimdal/lib/roken/err.h

diff --git a/source/static_deps.mk b/source/static_deps.mk
index 79f347d8e4121efb40be52ef1ea5a6e5719780df..3904149c38d969be7e40a77969925af57458183c 100644 (file)
--- a/source/static_deps.mk
+++ b/source/static_deps.mk
@@ -27,6 +27,7 @@ heimdal_basics: \
        heimdal/lib/krb5/heim_err.h \
        heimdal/lib/krb5/k524_err.h \
        heimdal/lib/krb5/krb5_err.h
+       ln -fs ./../des heimdal/lib/des/hcrypto
 
 proto: basics
 basics: include/includes.h \