summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-15 18:02:52 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-19 11:51:23 +0100
commite048fd517178d6e608b4c7f3d41799bcf5798d07 (patch)
tree31471e0bca3195b3b35e3ab01b990d5f23c52c58 /Configurations
parentf5c174ff9396053a2fbb73eec8b5e28d3da75797 (diff)
Big rename fest in makefile.shared: link_a / link_o -> link_shlib / link_dso
Originally, the Makefile.shared targets described what they used as input for a shared object, be it a shared library or a DSO. It turned out, however, that the link_o targets were used exclusively for engines and the link_a targets were for libcrypto and libssl. This rename fest turns and indication on the kind of input the targets get to the intention with using them. Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/unix-Makefile.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 8e2535b1ac..39a62e0cea 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -847,7 +847,7 @@ $target : $lib\$(LIB_EXT) $deps $ordinalsfile
CROSS_COMPILE="\$(CROSS_COMPILE)" \\
SHARED_LDFLAGS="\$(SHARED_LDFLAGS)" SHLIB_EXT=\$(SHLIB_EXT) \\
SHARED_RCFLAGS="\$(SHARED_RCFLAGS)" \\
- link_a.$shlib_target
+ link_shlib.$shlib_target
EOF
. (windowsdll() ? <<"EOF" : "");
rm -f apps/$shlib\$(SHLIB_EXT)
@@ -881,7 +881,7 @@ $target: $objs $deps
SHARED_LDFLAGS="\$(SHARED_LDFLAGS)" \\
SHLIB_EXT=\$(DSO_EXT) \\
LIBEXTRAS="$objs" \\
- link_o.$shlib_target
+ link_dso.$shlib_target
EOF
}
sub obj2lib {