diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-09-15 23:56:03 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-09-16 11:52:50 +0200 |
| commit | c5ad3076a6c076ac9f8449c393dd14c16b737560 (patch) | |
| tree | 4fb9276b8263a534bb81fc873d7bf91660da9865 /Configurations | |
| parent | Rearrange the storage of build file template names in %config (diff) | |
| download | openssl-c5ad3076a6c076ac9f8449c393dd14c16b737560.tar.xz openssl-c5ad3076a6c076ac9f8449c393dd14c16b737560.zip | |
Simplify the dependencies for remaking configdata.pm
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 924d63fe54..ba803651cb 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -517,7 +517,7 @@ debug_logicals : # Building targets ################################################### -configdata.pm : {- join(" ", sourcefile("Configurations", "descrip.mms.tmpl"), sourcefile("Configurations", "common.tmpl")) -} $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -} +configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -} @ WRITE SYS$OUTPUT "Reconfiguring..." perl $(SRCDIR)Configure reconf @ WRITE SYS$OUTPUT "*************************************************" diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 82bbb71e35..b4484213e4 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -836,7 +836,7 @@ openssl.pc: echo 'Version: '$(VERSION); \ echo 'Requires: libssl libcrypto' ) > openssl.pc -configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -} +configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -} @echo "Detected changed: $?" @echo "Reconfiguring..." $(SRCDIR)/Configure reconf diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 4a68558475..931d4dfb6e 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -327,7 +327,7 @@ uninstall_html_docs: # Building targets ################################################### -configdata.pm: "{- $config{build_file_template} -}" "$(SRCDIR)\Configurations\common.tmpl" "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}, @{$config{conf_files}}) -} +configdata.pm: "$(SRCDIR)\Configure" "{- join(" ", @{$config{build_file_templates}}) -}" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}, @{$config{conf_files}}) -} @echo "Detected changed: $?" @echo "Reconfiguring..." "$(PERL)" "$(SRCDIR)\Configure" reconf |