diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 17:14:03 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 13:50:32 +0100 |
| commit | 8f69c6462d2117a925975e851ad11f997908b5cc (patch) | |
| tree | 62c1fa27cff7ba34e484271c2a4c50efca427358 | |
| parent | c88cd9314eb6c86b54cccd57a259cb9a1ef36d73 (diff) | |
| download | samba-8f69c6462d2117a925975e851ad11f997908b5cc.tar.gz samba-8f69c6462d2117a925975e851ad11f997908b5cc.tar.bz2 samba-8f69c6462d2117a925975e851ad11f997908b5cc.zip | |
Use make to create lists of plugins, remove duplicate variable.
(This used to be commit 1ec6870966bcd25b1932da675386d3ad5bcd9b6f)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 73edd5f551..bb7d2afd8d 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -24,7 +24,6 @@ sub new($$$) $self->{python_dsos} = []; $self->{python_pys} = []; $self->{headers} = []; - $self->{plugins} = []; $self->{output} = ""; $self->{mkfile} = $mkfile; @@ -125,7 +124,7 @@ sub SharedModule($$) push (@{$self->{python_dsos}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}"); } else { - push (@{$self->{plugins}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}"); + $self->output("PLUGINS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n"); $self->output("installplugins:: $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n"); $self->output("\t\@echo Installing $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n"); $self->output("\t\@mkdir -p \$(DESTDIR)\$(modulesdir)/$sane_subsystem/\n"); @@ -398,7 +397,6 @@ sub write($$) $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->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n"); $self->_prepare_mk_files(); |