aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-07-06 03:07:16 +0200
committerRichard Levitte <levitte@openssl.org>2016-07-06 14:38:13 +0200
commit8478a70333d4d68f768847f8c2a8619b5bd15bcc (patch)
tree8c32ba08af88b33c455a21eb573972041f51119b
parentb385889640517531a9cfeb672b15db7089b1bbb8 (diff)
downloadopenssl-8478a70333d4d68f768847f8c2a8619b5bd15bcc.tar.gz
Make 'build_libs' build shared libraries as well
Reviewed-by: Matt Caswell <matt@openssl.org>
-rw-r--r--Configurations/descrip.mms.tmpl2
-rw-r--r--Configurations/unix-Makefile.tmpl2
-rw-r--r--Configurations/windows-makefile.tmpl2
3 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 5d98ee779b..de25c81d69 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -240,7 +240,7 @@ all : build_generated, -
depend
build_libs : build_generated, build_libs_nodep, depend
-build_libs_nodep : $(LIBS)
+build_libs_nodep : $(LIBS), $(SHLIBS)
build_engines : build_generated, build_engines_nodep, depend
build_engines_nodep : $(ENGINES)
build_apps : build_generated, build_apps_nodep, depend
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 34ba56a497..9898961561 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -764,7 +764,7 @@ FORCE:
# Building targets ###################################################
-libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS)
+libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS) {- join(" ",map { shlib_simple($_) } @{$unified_info{libraries}}) -}
libcrypto.pc:
@ ( echo 'prefix=$(INSTALLTOP)'; \
echo 'exec_prefix=$${prefix}'; \
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index fa430b6d6d..70fec0a8c7 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -168,7 +168,7 @@ all: build_generated \
build_libs_nodep build_engines_nodep build_apps_nodep depend
build_libs: build_generated build_libs_nodep depend
-build_libs_nodep: $(LIBS)
+build_libs_nodep: $(LIBS) {- join(" ",map { shlib_import($_) } @{$unified_info{libraries}}) -}
build_engines: build_generated build_engines_nodep depend
build_engines_nodep: $(ENGINES)
build_apps: build_generated build_apps_nodep depend