[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-875-gd318809
Jelmer Vernooij
jelmer at samba.org
Mon Feb 18 11:36:40 GMT 2008
The branch, v4-0-test has been updated
via d318809f0db71f4a37033c3e9f0dce2ee5a69b07 (commit)
from f5b2b20cafc137604bc527ca6bb2bc8edab551e9 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit d318809f0db71f4a37033c3e9f0dce2ee5a69b07
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 18 12:35:39 2008 +0100
Merge functions.
-----------------------------------------------------------------------
Summary of changes:
source/build/smb_build/makefile.pm | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index b7b5622..b84caa1 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -99,14 +99,12 @@ sub array2oneperline($)
return $output;
}
-sub _prepare_list_ex($$$$$)
+sub _prepare_list($$$)
{
- my ($self,$ctx,$var,$pre,$post) = @_;
+ my ($self,$ctx,$var) = @_;
my @tmparr = ();
- push(@tmparr, $pre) if defined($pre);
push(@tmparr, @{$ctx->{$var}}) if defined($ctx->{$var});
- push(@tmparr, $post) if defined($post);
my $tmplist = array2oneperline(\@tmparr);
return if ($tmplist eq "");
@@ -114,13 +112,6 @@ sub _prepare_list_ex($$$$$)
$self->output("$ctx->{NAME}_$var =$tmplist\n");
}
-sub _prepare_list($$$)
-{
- my ($self,$ctx,$var) = @_;
-
- $self->_prepare_list_ex($ctx, $var, undef, undef);
-}
-
sub Integrated($$)
{
my ($self,$ctx) = @_;
@@ -243,7 +234,6 @@ sub SharedLibrary($$)
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
-# $self->_prepare_list_ex($ctx, "LINK_FLAGS", "-Wl,--whole-archive", "-Wl,--no-whole-archive");
push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");
--
Samba Shared Repository
More information about the samba-cvs
mailing list