From 59c427963f1e445012f8bb78ca46d2ec317e2caf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 21 Mar 2006 07:42:00 +0000
Subject: r14605: Create heimdal/lib/des/hcrypto symlink if it doesn't exist
 (This used to be commit 303832bdc90f371c68185773009d143d1acf93ae)

---
 source4/build/smb_build/makefile.pm |  2 +-
 source4/heimdal/lib/des/hcrypto     |  1 -
 source4/heimdal_build/config.mk     | 15 ++++-----------
 source4/static_deps.mk              |  1 +
 4 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 120000 source4/heimdal/lib/des/hcrypto

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index add98b4fdc..7db6367fd2 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/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/source4/heimdal/lib/des/hcrypto b/source4/heimdal/lib/des/hcrypto
deleted file mode 120000
index 023d458e1d..0000000000
--- a/source4/heimdal/lib/des/hcrypto
+++ /dev/null
@@ -1 +0,0 @@
-./../des
\ No newline at end of file
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index f96aaedd3f..f1ed7943f4 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/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/source4/static_deps.mk b/source4/static_deps.mk
index 79f347d8e4..3904149c38 100644
--- a/source4/static_deps.mk
+++ b/source4/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 \
-- 
cgit