summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 17:18:23 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-16 17:18:23 +0100
commitcf3a45f06e9f143fff724b3c0938f7167e8da87b (patch)
tree55509b2ad536a4d9fe0b700719ac4f60e8a9e2f1 /source4/build
parent194e75da564581ed1e20dc7e6b5258fd0e45618b (diff)
downloadsamba-cf3a45f06e9f143fff724b3c0938f7167e8da87b.tar.gz
samba-cf3a45f06e9f143fff724b3c0938f7167e8da87b.tar.bz2
samba-cf3a45f06e9f143fff724b3c0938f7167e8da87b.zip
Use make to generate list of python files, remove unused variable.
(This used to be commit 7ec39624392fd0a0e64326e06acf9d42c86d06f9)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/makefile.pm11
1 files changed, 2 insertions, 9 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b589121523..986c237e8c 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;
@@ -137,8 +134,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");
@@ -351,7 +347,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");
}
}
@@ -405,9 +401,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->_prepare_mk_files();
$self->output($self->{mkfile});