Author: jelmer Date: 2006-03-19 15:59:12 +0000 (Sun, 19 Mar 2006) New Revision: 14562
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14562 Log: Use VPATH to solve strange heimdal dependencies Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl branches/SAMBA_4_0/source/heimdal_build/et_deps.pl Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-03-19 15:18:30 UTC (rev 14561) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-03-19 15:59:12 UTC (rev 14562) @@ -64,7 +64,7 @@ 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} Modified: branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl 2006-03-19 15:18:30 UTC (rev 14561) +++ branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl 2006-03-19 15:59:12 UTC (rev 14562) @@ -21,9 +21,8 @@ } 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 "[EMAIL PROTECTED] \"Compiling ASN1 file $file\"\n"; print "[EMAIL PROTECTED] $dirname && ../../../bin/asn1_compile $options $basename $prefix\n\n"; Modified: branches/SAMBA_4_0/source/heimdal_build/et_deps.pl =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/et_deps.pl 2006-03-19 15:18:30 UTC (rev 14561) +++ branches/SAMBA_4_0/source/heimdal_build/et_deps.pl 2006-03-19 15:59:12 UTC (rev 14562) @@ -8,7 +8,6 @@ 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 "[EMAIL PROTECTED] \"Compiling error table $file\"\n"; print "[EMAIL PROTECTED] $dirname && ../../../bin/compile_et $basename\n\n";
