sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-23 01:44:20 +03:00
Code Activity

r14565: Fix shared library sonames

Browse Source
This commit is contained in:
Jelmer Vernooij
2006-03-19 17:24:31 +00:00
committed by Gerald (Jerry) Carter
parent 4f99c96509
commit 3e6b75d955
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/build/smb_build/makefile.pm
View File

@@ -248,10 +248,9 @@ __EOD__
if ($self->{config}->{SONAMEFLAG} ne "" and if ($self->{config}->{SONAMEFLAG} ne "" and
defined($ctx->{LIBRARY_SONAME})) { defined($ctx->{LIBRARY_SONAME})) {
$soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} "; $soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} ";
} if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
$soargdebug = "\tln -fs $ctx->{LIBRARY_REALNAME} $ctx->{DEBUGDIR}/$ctx->{LIBRARY_SONAME}\n";
if ($self->{config}->{SONAMEFLAG} ne "") { }
$soargdebug = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_REALNAME} ";
} }
if ($self->{duplicate_build}) { if ($self->{duplicate_build}) {
@@ -262,9 +261,9 @@ $ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->
\@echo Linking \$\@ \@echo Linking \$\@
\@mkdir -p $ctx->{DEBUGDIR} \@mkdir -p $ctx->{DEBUGDIR}
\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\ \@\$(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) $init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
$soargdebug
__EOD__ __EOD__
); );
} }

2
source/dynconfig.mk
View File

@@ -1,4 +1,6 @@
[LIBRARY::DYNCONFIG] [LIBRARY::DYNCONFIG]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = dynconfig.o OBJ_FILES = dynconfig.o
PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \

2
source/torture/config.mk
View File

@@ -1,5 +1,7 @@
# TORTURE subsystem # TORTURE subsystem
[LIBRARY::torture] [LIBRARY::torture]
SO_VERSION = 0
VERSION = 0.0.1
PUBLIC_HEADERS = torture.h PUBLIC_HEADERS = torture.h
PUBLIC_PROTO_HEADER = proto.h PUBLIC_PROTO_HEADER = proto.h
OBJ_FILES = \ OBJ_FILES = \