Commit 5283e19f authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Fix the build_all_generated rule to include generated .map, .def and .opt files 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5900)
parent ceaa3894

Configurations/descrip.mms.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
                       grep { defined $unified_info{generate}->{$_} }

                       map { @{$unified_info{sources}->{$_}} }

                       grep { /\.o$/ } keys %{$unified_info{sources}} ),

                     ( grep { /\.h$/ } keys %{$unified_info{generate}} ) );

                     ( grep { /\.(?:h|opt)$/ } keys %{$unified_info{generate}} ) );



  # This is a horrible hack, but is needed because recursive inclusion of files

  # in different directories does not work well with HP C.

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ GENERATED={- join(" ", 
                  ( grep { defined $unified_info{generate}->{$_} }

                    map { @{$unified_info{sources}->{$_}} }

                    grep { /\.(?:o|res)$/ } keys %{$unified_info{sources}} ),

                  ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}

                  ( grep { /\.(?:h|map|def)$/ } keys %{$unified_info{generate}} )) -}



INSTALL_LIBS={- join(" ", map { lib($_) } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -}

Configurations/windows-makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ GENERATED={- join(" ", 
                    grep { defined $unified_info{generate}->{$_} }

                    map { @{$unified_info{sources}->{$_}} }

                    grep { /\.o$/ } keys %{$unified_info{sources}} ),

                  ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}

                  ( grep { /\.(?:h|def)$/ } keys %{$unified_info{generate}} )) -}



INSTALL_LIBS={- join(" ", map { lib($_) } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -}