Remove include/openssl/configuration.h from mandatory dependencies

Since this file is generated by configdata.pm, there's no need to include it
among the mandatory dependencies (which end up in the `GENERATE_MANDATORY`
Makefile variable).  In fact, it shouldn't be there any more, as that would
also cause it to be removed by `make clean`.

To compensate, we add an explicit removal of that file in the `distclean`
target on all platform families.

Fixes #18396

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18398)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index eb00587528efa67cdd3c6a97ec41469542f5dceb..b7d1df25928053190a5d6fd97ac552d2601b7b06 100644 (file)
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -549,6 +549,7 @@ clean : libclean
         - DELETE []vmsconfig.pm;*
 
 distclean : clean
+        - DELETE [.include.openssl]configuration.h;*
         - DELETE configdata.pm;*
         - DELETE descrip.mms;*
 

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 5b8340dfaab19cb20eaf586c085092b1ffc3ab70..110ba0687d801221d3b89eeefd49ec1e3e85fc71 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -594,6 +594,7 @@ clean: libclean
        -find . -type l \! -name '.*' -exec $(RM) {} \;
 
 distclean: clean
+       $(RM) include/openssl/configuration.h
        $(RM) configdata.pm
        $(RM) Makefile
 

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 5d874455f332168c9419899396aa0f844fb290de..47c10d79df2346e805fe570b479c459aaababb86 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -478,6 +478,7 @@ clean: libclean
        -rd /Q /S test\test-runs
 
 distclean: clean
+       -del /Q /F include\openssl\configuration.h
        -del /Q /F configdata.pm
        -del /Q /F makefile
 

diff --git a/build.info b/build.info
index 76284cb70f1ad8f077140aa6257bb11e1c86e869..5a8421623b97651178223b51743d2dfa4730bcf6 100644 (file)
--- a/build.info
+++ b/build.info
@@ -22,7 +22,6 @@ DEPEND[]=include/openssl/asn1.h \
          include/openssl/cmp.h \
          include/openssl/cms.h \
          include/openssl/conf.h \
-         include/openssl/configuration.h \
          include/openssl/crmf.h \
          include/openssl/crypto.h \
          include/openssl/ct.h \