diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-06-14 12:05:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:53:19 -0500 |
| commit | e505338bf74c60a235da1a141cad88e472f7bac8 (patch) | |
| tree | 48388bfea272b71b4413a55c18ec836dd3d3585b | |
| parent | b163ab8008fb0280677f55c5e5b6e3fddb2e0254 (diff) | |
| download | samba-e505338bf74c60a235da1a141cad88e472f7bac8.tar.gz samba-e505338bf74c60a235da1a141cad88e472f7bac8.tar.bz2 samba-e505338bf74c60a235da1a141cad88e472f7bac8.zip | |
r23487: fix the build with automatic dependencies
metze
(This used to be commit ebf8cd09c3a4e32e824e31178330dde2d867f5e1)
| -rw-r--r-- | source4/heimdal_build/config.mk | 8 | ||||
| -rwxr-xr-x | source4/heimdal_build/hcrypto-deps.pl | 9 |
2 files changed, 1 insertions, 16 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 5ab270cf18..a13a874101 100644 --- 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 index 0a2bba12a1..0000000000 --- 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"; -} |