summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 17:18:23 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 13:51:20 +0100
commitf165dad927c44f49d61a079b27103479f5f9bc80 (patch)
treed2413d5432fa8c308515814d4aabe4eba9b1cd50
parent8f69c6462d2117a925975e851ad11f997908b5cc (diff)
downloadsamba-f165dad927c44f49d61a079b27103479f5f9bc80.tar.gz
samba-f165dad927c44f49d61a079b27103479f5f9bc80.tar.bz2
samba-f165dad927c44f49d61a079b27103479f5f9bc80.zip
Use make to generate list of python files, remove unused variable.
(This used to be commit 67f15cd484dbf7b49e6c5cb2566ad95d05b66b5b)
-rw-r--r--source4/build/smb_build/makefile.pm10
1 files changed, 2 insertions, 8 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index bb7d2afd8d..96ab789b70 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -21,9 +21,6 @@ sub new($$$)
bless($self, $myname);
- $self->{python_dsos} = [];
- $self->{python_pys} = [];
- $self->{headers} = [];
$self->{output} = "";
$self->{mkfile} = $mkfile;
@@ -121,8 +118,7 @@ sub SharedModule($$)
$sane_subsystem =~ s/^lib//;
if ($ctx->{TYPE} eq "PYTHON") {
- push (@{$self->{python_dsos}},
- "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
+ $self->output("PYTHON_DSOS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
} else {
$self->output("PLUGINS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
$self->output("installplugins:: $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
@@ -340,7 +336,7 @@ sub PythonFiles($$)
my $target = "bin/python/".basename($_);
my $source = output::add_dir_str($ctx->{BASEDIR}, $_);
$self->output("$target: $source\n\n");
- push (@{$self->{python_pys}}, $target);
+ $self->output("PYTHON_PYS += $target\n");
}
}
@@ -394,8 +390,6 @@ sub write($$)
{
my ($self, $file) = @_;
- $self->output("PYTHON_DSOS = " . array2oneperline($self->{python_dsos}) . "\n");
- $self->output("PYTHON_PYS = " . array2oneperline($self->{python_pys}) . "\n");
$self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n");
$self->_prepare_mk_files();