root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Simplify configudata.pm dependency generation 

While we're at it, correct the fault in windows-makefile.tmpl

Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Richard Levitte 2016-09-17 20:50:56 +02:00
parent 76dc356384
commit 41240e68d7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configurations/descrip.mms.tmpl
View File

@ -517,7 +517,7 @@ debug_logicals :
# Building targets ################################################### # Building targets ###################################################
configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -} configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
@ WRITE SYS$OUTPUT "Reconfiguring..." @ WRITE SYS$OUTPUT "Reconfiguring..."
perl $(SRCDIR)Configure reconf perl $(SRCDIR)Configure reconf
@ WRITE SYS$OUTPUT "*************************************************" @ WRITE SYS$OUTPUT "*************************************************"

2
Configurations/unix-Makefile.tmpl
View File

@ -836,7 +836,7 @@ openssl.pc:
echo 'Version: '$(VERSION); \ echo 'Version: '$(VERSION); \
echo 'Requires: libssl libcrypto' ) > openssl.pc echo 'Requires: libssl libcrypto' ) > openssl.pc
configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -} configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
@echo "Detected changed: $?" @echo "Detected changed: $?"
@echo "Reconfiguring..." @echo "Reconfiguring..."
$(SRCDIR)/Configure reconf $(SRCDIR)/Configure reconf

2
Configurations/windows-makefile.tmpl
View File

@ -327,7 +327,7 @@ uninstall_html_docs:
# Building targets ################################################### # Building targets ###################################################
configdata.pm: "$(SRCDIR)\Configure" "{- join(" ", @{$config{build_file_templates}}) -}" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}, @{$config{conf_files}}) -} configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
@echo "Detected changed: $?" @echo "Detected changed: $?"
@echo "Reconfiguring..." @echo "Reconfiguring..."
"$(PERL)" "$(SRCDIR)\Configure" reconf "$(PERL)" "$(SRCDIR)\Configure" reconf