r14562: Use VPATH to solve strange heimdal dependencies

(This used to be commit 4d09ffa7f128e881fc891988ea672ae93a7ab45d)

3 files changed, 3 insertions, 5 deletions

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 3ac4ad53bc..443a66dfb3 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -64,7 +64,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}
+VPATH = $self->{config}->{srcdir}:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb
 srcdir = $self->{config}->{srcdir}
 builddir = $self->{config}->{builddir}
 
diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index 44a4f21de9..9c4a65976b 100755
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/heimdal_build/asn1_deps.pl
@@ -21,9 +21,8 @@ if (not defined $options) {
 }
 
 my $header = "$dirname/$prefix.h";
-my $short_header = "$prefix.h";
 
-print "$short_header $header: $file bin/asn1_compile\n";
+print "$header: $file bin/asn1_compile\n";
 print "\t\@echo \"Compiling ASN1 file $file\"\n";
 print "\t\@cd $dirname && ../../../bin/asn1_compile $options $basename $prefix\n\n";
 
diff --git a/source4/heimdal_build/et_deps.pl b/source4/heimdal_build/et_deps.pl
index 82bea621ae..2a8885e03d 100755
--- a/source4/heimdal_build/et_deps.pl
+++ b/source4/heimdal_build/et_deps.pl
@@ -8,7 +8,6 @@ my $basename = basename($file);
 
 my $header = $file; $header =~ s/\.et$/.h/;
 my $source = $file; $source =~ s/\.et$/.c/;
-my $short_header = $header; $short_header =~ s/(.*)\///g;
-print "$short_header $header $source: $file bin/compile_et\n";
+print "$header $source: $file bin/compile_et\n";
 print "\t\@echo \"Compiling error table $file\"\n";
 print "\t\@cd $dirname && ../../../bin/compile_et $basename\n\n";