svn commit: samba r22036 - in branches/SAMBA_4_0/source/build/smb_build: .

[jpeach at samba.org]

Author: jpeach
Date: 2007-04-02 17:26:18 +0000 (Mon, 02 Apr 2007)
New Revision: 22036

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22036

Log:
Make sure both srcdir and builddir are in VPATH.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-04-02 17:23:23 UTC (rev 22035)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-04-02 17:26:18 UTC (rev 22036)
@@ -71,11 +71,13 @@
 prefix = $self->{config}->{prefix}
 exec_prefix = $self->{config}->{exec_prefix}
 selftest_prefix = $self->{config}->{selftest_prefix}
+
+builddir = $self->{config}->{builddir}
 srcdir = $self->{config}->{srcdir}
-VPATH = \$(srcdir):heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
-builddir = $self->{config}->{builddir}
 datarootdir = $self->{config}->{datarootdir}
 
+VPATH = \$(builddir):\$(srcdir):heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
+
 BASEDIR = $self->{config}->{prefix}
 BINDIR = $self->{config}->{bindir}
 SBINDIR = $self->{config}->{sbindir}
@@ -329,7 +331,7 @@
 	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
 
 	push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)");
-		
+
 	$self->output(<< "__EOD__"
 #
 $ctx->{TARGET_STATIC_LIBRARY}: \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)