Commit 2801f671 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7583)

(cherry picked from commit e8d01a60)
parent 82ca4318

Configurations/descrip.mms.tmpl

+4 −4
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ descrip.mms : FORCE 


# Install helper targets #############################################



install_sw : all install_dev install_engines install_runtime -

install_sw : install_dev install_engines install_runtime -

             install_startup install_ivp



uninstall_sw : uninstall_dev uninstall_engines uninstall_runtime -
@@ -405,7 +405,7 @@ install_dev : check_INSTALLTOP install_runtime_libs 
                map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" }

                @{$unified_info{install}->{libraries}}) -}



install_engines : check_INSTALLTOP

install_engines : check_INSTALLTOP install_runtime_libs build_engines

        @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} !

        @ WRITE SYS$OUTPUT "*** Installing engines"

        - CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size} -}.'arch']
@@ -416,7 +416,7 @@ install_engines : check_INSTALLTOP 


install_runtime: install_programs



install_runtime_libs : check_INSTALLTOP

install_runtime_libs : check_INSTALLTOP build_libs

        @ {- output_off() if $disabled{shared}; "" -} !

        @ WRITE SYS$OUTPUT "*** Installing shareable images"

        @ ! Install shared (runtime) libraries
@@ -426,7 +426,7 @@ install_runtime_libs : check_INSTALLTOP 
                @install_shlibs) -}

        @ {- output_on() if $disabled{shared}; "" -} !



install_programs : check_INSTALLTOP install_runtime_libs

install_programs : check_INSTALLTOP install_runtime_libs build_programs

        @ {- output_off() if $disabled{apps}; "" -} !

        @ ! Install the main program

        - CREATE/DIR ossl_installroot:[EXE.'arch']

Configurations/unix-Makefile.tmpl

+4 −4
Original line number Diff line number Diff line
@@ -323,7 +323,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
@@ -461,7 +461,7 @@ uninstall_dev: 
	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(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"
@@ -490,7 +490,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)$(INSTALLTOP)/$(LIBDIR)
@@ -514,7 +514,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"

Configurations/windows-makefile.tmpl

+4 −4
Original line number Diff line number Diff line
@@ -267,7 +267,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
@@ -309,7 +309,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)"
@@ -322,7 +322,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"
@@ -332,7 +332,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"