summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 12:35:39 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 12:35:39 +0100
commite6514ceb2ffd7be93de483ed697cff47c9178864 (patch)
treebe955beafb2d13b7b3a551ea0a0ff78537f6f582
parentd7dc10468a2f14072a555154e65c87753f9e05cd (diff)
downloadsamba-e6514ceb2ffd7be93de483ed697cff47c9178864.tar.gz
samba-e6514ceb2ffd7be93de483ed697cff47c9178864.tar.bz2
samba-e6514ceb2ffd7be93de483ed697cff47c9178864.zip
Merge functions.
(This used to be commit d318809f0db71f4a37033c3e9f0dce2ee5a69b07)
-rw-r--r--source4/build/smb_build/makefile.pm14
1 files changed, 2 insertions, 12 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b7b56229f5..b84caa12d7 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/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)");