diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-11-07 16:13:57 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-11-08 23:23:46 +0100 |
| commit | e8d01a608705e4320082a11a3870aa7e19c7290f (patch) | |
| tree | 55e94f2482b5bff40e719b811d83332d797a027f /Configurations/windows-makefile.tmpl | |
| parent | c1123d9f7efb005a109aeccaba82c40bf9bd4c1d (diff) | |
Have install targets depend on more precise build targets
We only had the main 'install' target depend on 'all'. This changes
the dependencies so targets like install_dev, install_runtime_libs,
install_engines and install_programs depend on build targets that are
correspond to them more specifically. This increases the parallel
possibilities.
Fixes #7466
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7583)
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 704a764210..e1426ccf41 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -387,7 +387,7 @@ depend: # Install helper targets ############################################# -install_sw: all install_dev install_engines install_runtime +install_sw: install_dev install_engines install_runtime uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev @@ -432,7 +432,7 @@ install_dev: install_runtime_libs uninstall_dev: -install_engines: +install_engines: install_runtime_libs build_engines @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) @$(ECHO) "*** Installing engines" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(ENGINESDIR)" @@ -445,7 +445,7 @@ uninstall_engines: install_runtime: install_programs -install_runtime_libs: +install_runtime_libs: build_libs @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) @$(ECHO) "*** Installing runtime libraries" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin" @@ -455,7 +455,7 @@ install_runtime_libs: "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBPDBS) \ "$(INSTALLTOP)\bin" -install_programs: install_runtime_libs +install_programs: install_runtime_libs build_programs @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) @$(ECHO) "*** Installing runtime programs" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin" |