Use make to create lists of plugins, remove duplicate variable.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 16 Feb 2008 16:14:03 +0000 (17:14 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 12:50:32 +0000 (13:50 +0100)
source/build/smb_build/makefile.pm

index 73edd5f5519cbf01f691c2cd4b1983d621ba94d4..bb7d2afd8dfbb1b9acddab71211ed62643a04933 100644 (file)
@@ -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();