From d7dc10468a2f14072a555154e65c87753f9e05cd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 18 Feb 2008 12:26:43 +0100
Subject: Eliminate duplicate variable. (This used to be commit
 f5b2b20cafc137604bc527ca6bb2bc8edab551e9)

---
 source4/Makefile                    | 2 +-
 source4/build/smb_build/makefile.pm | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/source4/Makefile b/source4/Makefile
index a2f0afc5f1..ea98b5e469 100644
--- 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 16b46ed343..b7b56229f5 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -29,7 +29,6 @@ sub new($$$)
 	$self->{python_pys} = [];
 	$self->{shared_libs} = [];
 	$self->{headers} = [];
-	$self->{shared_modules} = [];
 	$self->{plugins} = [];
 	$self->{pc_files} = [];
 	$self->{proto_headers} = [];
@@ -149,7 +148,6 @@ 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("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");
@@ -456,7 +454,6 @@ sub write($$)
 	$self->output("PC_FILES = " . array2oneperline($self->{pc_files}) . "\n");
 	$self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n");
 	$self->output("PROTO_HEADERS = " . array2oneperline($self->{proto_headers}) .  "\n");
-	$self->output("SHARED_MODULES = " . array2oneperline($self->{shared_modules}) . "\n");
 	$self->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n");
 
 	$self->_prepare_mk_files();
-- 
cgit