diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-11-07 16:13:57 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-11-09 06:20:52 +0100 |
| commit | 201a33f4abb639527da28e83e6ae782907a1c114 (patch) | |
| tree | afb555b9bbce998c1f1fda76fdd5aca8b8dc549e /Configurations/unix-Makefile.tmpl | |
| parent | d582f154695e5fd908bc86743432dc9b5866417b (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)
(cherry picked from commit e8d01a608705e4320082a11a3870aa7e19c7290f)
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index f145626757..7de614a822 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -437,7 +437,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 @@ -607,7 +607,7 @@ uninstall_dev: uninstall_runtime_libs -$(RMDIR) $(DESTDIR)$(libdir)/pkgconfig -$(RMDIR) $(DESTDIR)$(libdir) -install_engines: +install_engines: install_runtime_libs build_engines @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/ @$(ECHO) "*** Installing engines" @@ -636,7 +636,7 @@ uninstall_engines: install_runtime: install_programs -install_runtime_libs: +install_runtime_libs: build_libs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @ : {- output_off() if windowsdll(); "" -} @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir) @@ -660,7 +660,7 @@ install_runtime_libs: : {- output_on() if windowsdll(); "" -}; \ done -install_programs: install_runtime_libs +install_programs: install_runtime_libs build_programs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin @$(ECHO) "*** Installing runtime programs" |