Make 'build_libs' build shared libraries as well
authorRichard Levitte <levitte@openssl.org>
Wed, 6 Jul 2016 01:07:16 +0000 (03:07 +0200)
committerRichard Levitte <levitte@openssl.org>
Wed, 6 Jul 2016 12:38:13 +0000 (14:38 +0200)
Reviewed-by: Matt Caswell <matt@openssl.org>
Configurations/descrip.mms.tmpl
Configurations/unix-Makefile.tmpl
Configurations/windows-makefile.tmpl

index 5d98ee779b9d61a56cabf63ec47f6e968a5a4fa2..de25c81d695247851d224516b7281a00c801d149 100644 (file)
@@ -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
index 34ba56a49705098bb0b1bd8f11a1af1b470ca166..989896156156fad231094ac0e17036a95912fe91 100644 (file)
@@ -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}'; \
index fa430b6d6d233c3931ac1ffae3dcb17e8d653df9..70fec0a8c7e9d03a65ac0cf1cc442b0c208f2754 100644 (file)
@@ -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