Use make to create lists of plugins, remove duplicate variable.

(This used to be commit 36cc584374d32c7875333fa5abd97b31e83291aa)

diff --git a/source4/Makefile b/source4/Makefile
index a2f0afc5f1f7e18d6b838531138f4a21e54f16f7..ea98b5e469f522400a1a9fbb7e2da45629ed94b6 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -29,7 +29,7 @@ DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
 
 binaries::
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
-modules:: $(SHARED_MODULES)
+modules:: $(PLUGINS)
 headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
 manpages:: $(MANPAGES)
 all:: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules pythonmods

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 0f0c716cacc0899abc33b822ea1b94dc96890534..bac9c30f3a9f8e14de8d0d3b0da65f44734320bc 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -24,8 +24,6 @@ sub new($$$)
        $self->{python_dsos} = [];
        $self->{python_pys} = [];
        $self->{headers} = [];
-       $self->{shared_modules} = [];
-       $self->{plugins} = [];
        $self->{output} = "";
 
        $self->{mkfile} = $mkfile;
@@ -142,8 +140,7 @@ sub SharedModule($$)
                push (@{$self->{python_dsos}}, 
                        "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
        } else {
-               push (@{$self->{shared_modules}}, "$ctx->{TARGET_SHARED_LIBRARY}");
-               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");
@@ -421,8 +418,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("SHARED_MODULES = " . array2oneperline($self->{shared_modules}) . "\n");
-       $self->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n");
 
        $self->_prepare_mk_files();