From dc5facac9a4e904d32f01137ce95edd21b42ebe9 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 16 Jun 2017 03:46:41 +0200 Subject: [PATCH] Add the target 'build_all_generated' This new target is used to build all generated files and only that. This can be used to prepare everything that requires things like perl for a system that lacks perl and then move everything to that system and do the rest of the build there. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/3695) (cherry picked from commit 9b03b91b84b64c086081b87bd0a2c7d3612af6c0) --- CHANGES | 6 ++++++ Configurations/descrip.mms.tmpl | 4 ++++ Configurations/unix-Makefile.tmpl | 4 ++++ Configurations/windows-makefile.tmpl | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/CHANGES b/CHANGES index 0ac2f904bc..8840bd6c00 100644 --- a/CHANGES +++ b/CHANGES @@ -9,6 +9,12 @@ Changes between 1.1.0g and 1.1.0h [xx XXX xxxx] + *) Add a build target 'build_all_generated', to build all generated files + and only that. This can be used to prepare everything that requires + things like perl for a system that lacks perl and then move everything + to that system and do the rest of the build there. + [Richard Levitte] + *) Backport SSL_OP_NO_RENGOTIATION OpenSSL 1.0.2 and below had the ability to disable renegotiation using the diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 6f6a9ace24..7e3356f1f1 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -264,6 +264,10 @@ build_programs_nodep : $(PROGRAMS), $(SCRIPTS) # Kept around for backward compatibility build_apps build_tests : build_programs +# Convenience target to prebuild all generated files, not just the mandatory +# ones +build_all_generated : $(GENERATED_MANDATORY) $(GENERATED) + test : tests {- dependmagic('tests'); -} : build_programs_nodep, build_engines_nodep @ ! {- output_off() if $disabled{tests}; "" -} diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index a1ef7e6e93..79993e3a89 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -241,6 +241,10 @@ build_programs_nodep: $(PROGRAMS) $(SCRIPTS) # Kept around for backward compatibility build_apps build_tests: build_programs +# Convenience target to prebuild all generated files, not just the mandatory +# ones +build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) + test: tests {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep link-utils @ : {- output_off() if $disabled{tests}; "" -} diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 29d157deff..e86ba27dd1 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -201,6 +201,10 @@ build_programs_nodep: $(PROGRAMS) $(SCRIPTS) # Kept around for backward compatibility build_apps build_tests: build_programs +# Convenience target to prebuild all generated files, not just the mandatory +# ones +build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) + test: tests {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep @rem {- output_off() if $disabled{tests}; "" -} -- 2.25.1