From: Richard Levitte Date: Wed, 6 Jul 2016 01:07:16 +0000 (+0200) Subject: Make 'build_libs' build shared libraries as well X-Git-Tag: OpenSSL_1_1_0-pre6~264 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8478a70333d4d68f768847f8c2a8619b5bd15bcc;p=thirdparty%2Fopenssl.git Make 'build_libs' build shared libraries as well Reviewed-by: Matt Caswell --- diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 5d98ee779b9..de25c81d695 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 34ba56a4970..98989615615 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 fa430b6d6d2..70fec0a8c7e 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