diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-21 07:42:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:59:00 -0500 |
| commit | 59c427963f1e445012f8bb78ca46d2ec317e2caf (patch) | |
| tree | 1b675d432336446a3ecc9d141e0a1dbc7c981460 | |
| parent | e67c24159b4847c9384c79194cd45375435d1e3b (diff) | |
| download | samba-59c427963f1e445012f8bb78ca46d2ec317e2caf.tar.gz samba-59c427963f1e445012f8bb78ca46d2ec317e2caf.tar.bz2 samba-59c427963f1e445012f8bb78ca46d2ec317e2caf.zip | |
r14605: Create heimdal/lib/des/hcrypto symlink if it doesn't exist
(This used to be commit 303832bdc90f371c68185773009d143d1acf93ae)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 2 | ||||
| l--------- | source4/heimdal/lib/des/hcrypto | 1 | ||||
| -rw-r--r-- | source4/heimdal_build/config.mk | 15 | ||||
| -rw-r--r-- | source4/static_deps.mk | 1 |
4 files changed, 6 insertions, 13 deletions
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 \ |