Skip to content

Commit

Permalink
Remove include/openssl/configuration.h from mandatory dependencies
Browse files Browse the repository at this point in the history
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 openssl#18396

Reviewed-by: Dmitry Belyavskiy <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#18398)
  • Loading branch information
levitte committed May 25, 2022
1 parent cb0c36d commit ef8040b
Showing 4 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions Configurations/descrip.mms.tmpl
Original file line number Diff line number Diff line change
@@ -549,6 +549,7 @@ clean : libclean
- DELETE []vmsconfig.pm;*

distclean : clean
- DELETE [.include.openssl]configuration.h;*
- DELETE configdata.pm;*
- DELETE descrip.mms;*

1 change: 1 addition & 0 deletions Configurations/unix-Makefile.tmpl
Original file line number Diff line number Diff line change
@@ -594,6 +594,7 @@ clean: libclean
-find . -type l \! -name '.*' -exec $(RM) {} \;

distclean: clean
$(RM) include/openssl/configuration.h
$(RM) configdata.pm
$(RM) Makefile

1 change: 1 addition & 0 deletions Configurations/windows-makefile.tmpl
Original file line number Diff line number Diff line change
@@ -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

1 change: 0 additions & 1 deletion build.info
Original file line number Diff line number Diff line change
@@ -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 \

0 comments on commit ef8040b

Please sign in to comment.