From d803ff9e724cc91778c1b94a5b78ef935200adb8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 16 Feb 2008 16:33:04 +0100
Subject: Remove unused code. (This used to be commit
 98d6095b9605ff4db61394719f29b3e38349c59f)

---
 source4/Makefile                    | 6 +++---
 source4/build/smb_build/makefile.pm | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'source4')

diff --git a/source4/Makefile b/source4/Makefile
index e5399e4c32..a2f0afc5f1 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -27,7 +27,7 @@ include data.mk
 DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
 		  $(srcdir)/version.h
 
-binaries:: $(BINARIES)
+binaries::
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
 modules:: $(SHARED_MODULES)
 headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
@@ -124,8 +124,8 @@ installbin:: $(SBIN_PROGS) $(BIN_PROGS) $(TORTURE_PROGS) installdirs
 
 installplugins::
 
-installlib:: $(INSTALLABLE_SHARED_LIBS) $(STATIC_LIBS) installdirs
-	@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(SHLIBEXT)" $(INSTALLABLE_SHARED_LIBS) 
+installlib:: $(SHARED_LIBS) $(STATIC_LIBS) installdirs
+	@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(SHLIBEXT)" $(SHARED_LIBS) 
 	#@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(STLIBEXT)" $(STATIC_LIBS)
 
 installheader:: headers installdirs
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 427828128a..9c6d52cfef 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -28,7 +28,6 @@ sub new($$$)
 	$self->{python_dsos} = [];
 	$self->{python_pys} = [];
 	$self->{shared_libs} = [];
-	$self->{installable_shared_libs} = [];
 	$self->{headers} = [];
 	$self->{shared_modules} = [];
 	$self->{plugins} = [];
@@ -243,7 +242,6 @@ sub SharedLibrary($$)
 	my ($self,$ctx) = @_;
 
 	push (@{$self->{shared_libs}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
-	push (@{$self->{installable_shared_libs}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
 
 	$self->_prepare_list($ctx, "DEPEND_LIST");
 	$self->_prepare_list($ctx, "LINK_FLAGS");
@@ -334,7 +332,7 @@ sub Binary($$)
 		push (@{$self->{bin_progs}}, "$installdir/$ctx->{BINARY}");
 	}
 
-	push (@{$self->{binaries}}, "$localdir/$ctx->{BINARY}");
+	$self->output("binaries:: $localdir/$ctx->{BINARY}\n");
 
 	$self->_prepare_list($ctx, "OBJ_LIST");
 	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
@@ -431,12 +429,10 @@ sub write($$)
 	$self->output("MANPAGES = " . array2oneperline($self->{manpages})."\n");
 	$self->output("BIN_PROGS = " . array2oneperline($self->{bin_progs}) . "\n");
 	$self->output("SBIN_PROGS = " . array2oneperline($self->{sbin_progs}) . "\n");
-	$self->output("BINARIES = " . array2oneperline($self->{binaries}) . "\n");
 	$self->output("STATIC_LIBS = " . array2oneperline($self->{static_libs}) . "\n");
 	$self->output("SHARED_LIBS = " . array2oneperline($self->{shared_libs}) . "\n");
 	$self->output("PYTHON_DSOS = " . array2oneperline($self->{python_dsos}) . "\n");
 	$self->output("PYTHON_PYS = " . array2oneperline($self->{python_pys}) . "\n");
-	$self->output("INSTALLABLE_SHARED_LIBS = " . array2oneperline($self->{installable_shared_libs}) . "\n");
 	$self->output("PUBLIC_HEADERS = " . array2oneperline($self->{headers}) . "\n");
 	$self->output("PC_FILES = " . array2oneperline($self->{pc_files}) . "\n");
 	$self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n");
-- 
cgit