From ef8040bce02758de86fc55412ee4ac9102f9ffab Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 24 May 2022 17:20:52 +0200 Subject: [PATCH] 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 Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/18398) --- Configurations/descrip.mms.tmpl | 1 + Configurations/unix-Makefile.tmpl | 1 + Configurations/windows-makefile.tmpl | 1 + build.info | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index eb00587528..b7d1df2592 100644 --- 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 5b8340dfaa..110ba0687d 100644 --- 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 5d874455f3..47c10d79df 100644 --- 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 76284cb70f..5a8421623b 100644 --- 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 \