Commit 41240e68 authored by Richard Levitte's avatar Richard Levitte
Browse files

Simplify configudata.pm dependency generation 



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

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 76dc3563

Configurations/descrip.mms.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ debug_logicals : 


# 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..."

        perl $(SRCDIR)Configure reconf

        @ WRITE SYS$OUTPUT "*************************************************"

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ openssl.pc: 
	    echo 'Version: '$(VERSION); \

	    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 "Reconfiguring..."

	$(SRCDIR)/Configure reconf

Configurations/windows-makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ uninstall_html_docs: 


# 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 "Reconfiguring..."

	"$(PERL)" "$(SRCDIR)\Configure" reconf