[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  02f603f29753b9b07a4d71229c68465e56e4f352 (commit)
      from  dc9887c0199f5b7579e7b82dd7910008e419816f (commit)


- Log -----------------------------------------------------------------
commit 02f603f29753b9b07a4d71229c68465e56e4f352
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri May 20 09:30:06 2016 +0200

    Makefile.shared: revert Haiku support commit.
    
    Configurations/50-haiku.conf reuses gnu-shared rules and doesn't
    require dedicated targets.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.shared | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.shared b/Makefile.shared
index 68b87a7..d856180 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -562,11 +562,11 @@ symlink.hpux:
 symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
 
 # Compatibility targets
-link_dso.bsd-gcc-shared link_dso.linux-shared link_dso.gnu-shared link_dso.haiku-shared: link_dso.gnu
+link_dso.bsd-gcc-shared link_dso.linux-shared link_dso.gnu-shared: link_dso.gnu
 link_shlib.bsd-gcc-shared: link_shlib.linux-shared
-link_shlib.gnu-shared link_shlib.haiku-shared: link_shlib.gnu
-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu
-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu
+link_shlib.gnu-shared: link_shlib.gnu
+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
 link_dso.bsd-shared: link_dso.bsd
 link_shlib.bsd-shared: link_shlib.bsd
 link_app.bsd-shared: link_app.bsd