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 #18396

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

(cherry picked from commit ef8040b)
  • Loading branch information
levitte committed May 25, 2022
1 parent 046b0d7 commit 4f42f2a
Show file tree
Hide file tree
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
Expand Up @@ -549,6 +549,7 @@ clean : libclean
- DELETE []vmsconfig.pm;*

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

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

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

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

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

0 comments on commit 4f42f2a

Please sign in to comment.