summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-19 17:24:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:47 -0500
commit3ddf4e831a4c66d085f1294aa008f5655416ae7c (patch)
tree41e634df9148ddd52120933301a4232eba960aa8 /source4
parente1e31b4554ef63700fa8a6e487168c755c031c27 (diff)
downloadsamba-3ddf4e831a4c66d085f1294aa008f5655416ae7c.tar.gz
samba-3ddf4e831a4c66d085f1294aa008f5655416ae7c.tar.bz2
samba-3ddf4e831a4c66d085f1294aa008f5655416ae7c.zip
r14565: Fix shared library sonames
(This used to be commit 3e6b75d955cc49becf9145fbe4380c4e7e7f81f6)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm11
-rw-r--r--source4/dynconfig.mk2
-rw-r--r--source4/torture/config.mk2
3 files changed, 9 insertions, 6 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 73f315cf4f..6ed1c36d13 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -248,10 +248,9 @@ __EOD__
if ($self->{config}->{SONAMEFLAG} ne "" and
defined($ctx->{LIBRARY_SONAME})) {
$soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} ";
- }
-
- if ($self->{config}->{SONAMEFLAG} ne "") {
- $soargdebug = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_REALNAME} ";
+ if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
+ $soargdebug = "\tln -fs $ctx->{LIBRARY_REALNAME} $ctx->{DEBUGDIR}/$ctx->{LIBRARY_SONAME}\n";
+ }
}
if ($self->{duplicate_build}) {
@@ -262,9 +261,9 @@ $ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->
\@echo Linking \$\@
\@mkdir -p $ctx->{DEBUGDIR}
\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\
- \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soargdebug \\
+ \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
-
+$soargdebug
__EOD__
);
}
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk
index 9460ae8655..a7b0ff6ecd 100644
--- a/source4/dynconfig.mk
+++ b/source4/dynconfig.mk
@@ -1,4 +1,6 @@
[LIBRARY::DYNCONFIG]
+VERSION = 0.0.1
+SO_VERSION = 0
OBJ_FILES = dynconfig.o
PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 5dd288cf6c..1cd0ad3303 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -1,5 +1,7 @@
# TORTURE subsystem
[LIBRARY::torture]
+SO_VERSION = 0
+VERSION = 0.0.1
PUBLIC_HEADERS = torture.h
PUBLIC_PROTO_HEADER = proto.h
OBJ_FILES = \