Add a developer target 'build_generated' to rebuild mandatory headers

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 66eaeadd6ae6b94b1b6498182f10773c859f99db..0c0534c8efb1fd15002af4980968278723e9291d 100644 (file)
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -223,20 +223,22 @@ NODEBUG=@
 
 # The main targets ###################################################
 
-all : $(GENERATED_MANDATORY), -
+all : build_generated, -
       build_libs_nodep, build_engines_nodep, build_apps_nodep, -
       depend
 
-build_libs : $(GENERATED_MANDATORY), build_libs_nodep, depend
+build_libs : build_generated, build_libs_nodep, depend
 build_libs_nodep : $(LIBS)
-build_engines : $(GENERATED_MANDATORY), build_engines_nodep, depend
+build_engines : build_generated, build_engines_nodep, depend
 build_engines_nodep : $(ENGINES)
-build_apps : $(GENERATED_MANDATORY), build_apps_nodep, depend
+build_apps : build_generated, build_apps_nodep, depend
 build_apps_nodep : $(PROGRAMS), $(SCRIPTS)
-build_tests : $(GENERATED_MANDATORY), build_tests_nodep, depend
+build_tests : build_generated, build_tests_nodep, depend
 build_tests_nodep : $(TESTPROGS)
 
-test tests : $(GENERATED_MANDATORY), -
+build_generated : $(GENERATED_MANDATORY)
+
+test tests : build_generated, -
              build_apps_nodep, build_engines_nodep, build_tests_nodep, -
              depend
         @ ! {- output_off() if $disabled{tests}; "" -}

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 2e5dd68b4851694177f817c865703c1cff8c92e7..04964dcf5dd76a742cb30d43fdbb0d98001ebaee 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -210,21 +210,23 @@ PROCESSOR= {- $config{processor} -}
 
 # The main targets ###################################################
 
-all: $(GENERATED_MANDATORY) \
+all: build_generated \
      build_libs_nodep build_engines_nodep build_apps_nodep \
      depend link-utils
 
-build_libs: $(GENERATED_MANDATORY) build_libs_nodep depend
+build_libs: build_generated build_libs_nodep depend
 build_libs_nodep: libcrypto.pc libssl.pc openssl.pc
-build_engines: $(GENERATED_MANDATORY) build_engines_nodep depend
+build_engines: build_generated build_engines_nodep depend
 build_engines_nodep: $(ENGINES)
-build_apps: $(GENERATED_MANDATORY) build_apps_nodep depend
+build_apps: build_generated build_apps_nodep depend
 build_apps_nodep: $(PROGRAMS) $(SCRIPTS)
-build_tests: $(GENERATED_MANDATORY) build_tests_nodep depend
+build_tests: build_generated build_tests_nodep depend
 build_tests_nodep: $(TESTPROGS)
 
+build_generated: $(GENERATED_MANDATORY)
+
 test: tests
-tests: $(GENERATED_MANDATORY) \
+tests: build_generated \
        build_tests_nodep build_apps_nodep build_engines_nodep \
        depend link-utils
        @ : {- output_off() if $disabled{tests}; "" -}

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index b1c5554f6b77447bfc6b361582b9a19656a3520f..0a06b115afe53833d612691573dca73a2c3306b4 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -145,20 +145,22 @@ PROCESSOR= {- $config{processor} -}
 
 # The main targets ###################################################
 
-all: $(GENERATED_MANDATORY) \
+all: build_generated \
      build_libs_nodep build_engines_nodep build_apps_nodep depend
 
-build_libs: $(GENERATED_MANDATORY) build_libs_nodep depend
+build_libs: build_generated build_libs_nodep depend
 build_libs_nodep: $(LIBS)
-build_engines: $(GENERATED_MANDATORY) build_engines_nodep depend
+build_engines: build_generated build_engines_nodep depend
 build_engines_nodep: $(ENGINES)
-build_apps: $(GENERATED_MANDATORY) build_apps_nodep depend
+build_apps: build_generated build_apps_nodep depend
 build_apps_nodep: $(PROGRAMS) $(SCRIPTS)
-build_tests: $(GENERATED_MANDATORY) build_tests_nodep depend
+build_tests: build_generated build_tests_nodep depend
 build_tests_nodep: $(TESTPROGS)
 
+build_generated: $(GENERATED_MANDATORY)
+
 test: tests
-tests: $(GENERATED_MANDATORY) \
+tests: build_generated \
        build_tests_nodep build_apps_nodep build_engines_nodep depend
        @rem {- output_off() if $disabled{tests}; "" -}
        set SRCTOP=$(SRCDIR)