From 2bf39edc9d0abf3306bd25b9c40d88aceb029be7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Mar 2008 15:28:12 +0100
Subject: Push SOVERSION and VERSION out of perl code. (This used to be commit
 0ba8ac6a14c62ff9edfe9f0bf43b8a7406b85291)

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

(limited to 'source4/build')

diff --git a/source4/build/make/rules.mk b/source4/build/make/rules.mk
index 6bb9247df8..d7482fe45c 100644
--- a/source4/build/make/rules.mk
+++ b/source4/build/make/rules.mk
@@ -190,10 +190,10 @@ include/includes.d: include/includes.h
 	@-mkdir -p `dirname $@`
 	@$(COMPILE) && exit 0 ; \
 		echo "The following command failed:" 1>&2;\
+		echo "$(COMPILE)" 1>&2;\
 		$(COMPILE) >/dev/null 2>&1
 
 
-#		echo "$(COMPILE)" 1>&2;\
 
 .c.ho:
 	@echo "Compiling $< with host compiler"
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 6d879ff02b..2a4621de30 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -147,9 +147,6 @@ sub SharedLibraryPrimitives($$)
 {
 	my ($self,$ctx) = @_;
 
-	$self->output("$ctx->{NAME}_SOVERSION = $ctx->{SO_VERSION}\n") if (defined($ctx->{SO_VERSION}));
-	$self->output("$ctx->{NAME}_VERSION = $ctx->{VERSION}\n") if (defined($ctx->{VERSION}));
-
 	if (not grep(/STATIC_LIBRARY/, @{$ctx->{OUTPUT_TYPE}})) {
 		$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
 		$self->_prepare_list($ctx, "FULL_OBJ_LIST");
-- 
cgit