sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

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

Browse Source
This commit is contained in:
James Peach 2007-04-02 17:26:18 +00:00 committed by Gerald (Jerry) Carter
parent 976343821b
commit 9400f07738
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/build/smb_build/makefile.pm
View File

@ -71,11 +71,13 @@ sub _prepare_path_vars($)
prefix = $self->{config}->{prefix} prefix = $self->{config}->{prefix}
exec_prefix = $self->{config}->{exec_prefix} exec_prefix = $self->{config}->{exec_prefix}
selftest_prefix = $self->{config}->{selftest_prefix} selftest_prefix = $self->{config}->{selftest_prefix}
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} builddir = $self->{config}->{builddir}
srcdir = $self->{config}->{srcdir}
datarootdir = $self->{config}->{datarootdir} 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} BASEDIR = $self->{config}->{prefix}
BINDIR = $self->{config}->{bindir} BINDIR = $self->{config}->{bindir}
SBINDIR = $self->{config}->{sbindir} SBINDIR = $self->{config}->{sbindir}
@ -329,7 +331,7 @@ sub StaticLibrary($$)
$self->_prepare_list($ctx, "FULL_OBJ_LIST"); $self->_prepare_list($ctx, "FULL_OBJ_LIST");
push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)"); push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)");
$self->output(<< "__EOD__" $self->output(<< "__EOD__"
# #
$ctx->{TARGET_STATIC_LIBRARY}: \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) $ctx->{TARGET_STATIC_LIBRARY}: \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)