The branch, v4-0-test has been updated
via 94b0dd7ab0f5cc5493ea8dcfd8be54e1bec26283 (commit)
via 3506c707c5e390a0634e597362f454399fb50b07 (commit)
from 666311dccf19293316b0335c5418446c66e76101 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 94b0dd7ab0f5cc5493ea8dcfd8be54e1bec26283
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sat Feb 16 19:19:02 2008 +0100
Move logic to makefile
commit 3506c707c5e390a0634e597362f454399fb50b07
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Mon Feb 25 18:14:03 2008 +0100
Use more GNU-make specific variables.
-----------------------------------------------------------------------
Summary of changes:
source/build/smb_build/makefile.pm | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/smb_build/makefile.pm
b/source/build/smb_build/makefile.pm
index 8e6df89..a152bfc 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -245,15 +245,15 @@ sub SharedLibrary($$)
}
}
- if (defined($ctx->{LIBRARY_SONAME})) {
- $lns .= "[EMAIL PROTECTED] -fs $ctx->{LIBRARY_REALNAME}
$ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}";
- }
+ $lns .= "\nifdef $ctx->{NAME}_SOVERSION";
+ $lns .= "[EMAIL PROTECTED] -fs $ctx->{LIBRARY_REALNAME}
$ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}";
+ $lns .= "\nendif";
$self->output(<< "__EOD__"
#
$ctx->{RESULT_SHARED_LIBRARY}: \$($ctx->{NAME}_DEPEND_LIST)
\$($ctx->{NAME}_FULL_OBJ_LIST)
[EMAIL PROTECTED] Linking \$\@
- [EMAIL PROTECTED] -p $ctx->{SHAREDDIR}
+ [EMAIL PROTECTED] -p \$(D@)
[EMAIL PROTECTED](SHLD) \$(LDFLAGS) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS)
-o \$\@ \$(INSTALL_LINK_FLAGS) \\
\$($ctx->{NAME}\_FULL_OBJ_LIST) \\
\$($ctx->{NAME}_LINK_FLAGS) \\
@@ -274,7 +274,7 @@ sub MergedObj($$)
#
$ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_OBJ_LIST)
[EMAIL PROTECTED] Partially linking \$@
- [EMAIL PROTECTED] -p bin/mergedobj
+ [EMAIL PROTECTED] -p \$(D@)
\$(PARTLINK) -o \$@ \$($ctx->{NAME}_OBJ_LIST)
__EOD__
--
Samba Shared Repository
