Commit 18d15882 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Configurations/*.tmpl: refine build_all_generated. 



Purpose of build_all_generated is to execute all the rules that require
perl, so that one can copy the tree to system with compiler but without
perl. This commit removes last dependencies on perl.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5929)
parent 0652e8a7

Configurations/descrip.mms.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -415,6 +415,11 @@ build_apps build_tests : build_programs 
# Convenience target to prebuild all generated files, not just the mandatory

# ones

build_all_generated : $(GENERATED_MANDATORY) $(GENERATED)

	@ ! {- output_off() if $disabled{makedepend}; "" -}

	@ WRITE SYS$OUTPUT "Warning: consider configuring with no-makedepend, because if"

	@ WRITE SYS$OUTPUT "         target system doesn't have $(PERL),"

	@ WRITE SYS$OUTPUT "         then make will fail..."

	@ ! {- output_on() if $disabled{makedepend}; "" -}



test : tests

{- dependmagic('tests'); -} : build_programs_nodep, build_engines_nodep

Configurations/unix-Makefile.tmpl

+11 −10
Original line number Diff line number Diff line
@@ -353,6 +353,11 @@ build_apps build_tests: build_programs 
# Convenience target to prebuild all generated files, not just the mandatory

# ones

build_all_generated: $(GENERATED_MANDATORY) $(GENERATED)

	@ : {- output_off() if $disabled{makedepend}; "" -}

	@echo "Warning: consider configuring with no-makedepend, because if"

	@echo "         target system doesn't have $(PERL),"

	@echo "         then make will fail..."

	@ : {- output_on() if $disabled{makedepend}; "" -}



test: tests

{- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep link-utils
@@ -1000,18 +1005,14 @@ $obj$objext: $deps 
	$cmd $cmdflags -c -o \$\@ $srcs

EOF

      } elsif (grep /\.S$/, @srcs) {

          # In case one wonders why not just $(CC) -c file.S. While it

          # does work with contemporary compilers, there are some legacy

          # ones that get it wrong. Hence the elaborate scheme... We

          # don't care to maintain dependecy lists, because dependency

          # is rather weak, at most one header file that lists constants

          # which are assigned in ascending order.

          # Originally there was mutli-step rule with $(CC) -E file.S

          # followed by $(CC) -c file.s. It compensated for one of

          # legacy platform compiler's inability to handle .S files.

          # The platform is long discontinued by vendor so there is

          # hardly a point to drag it along...

          $recipe .= <<"EOF";

$obj$objext: $deps

	( trap "rm -f \$@.*" INT 0; \\

	  \$(CC) $incs $cmdflags -E $srcs | \\

	  \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@.s && \\

	  $cmd $cmdflags -c -o \$\@ \$@.s )

	$cmd $incs $cmdflags -c -o \$\@ $srcs

EOF

      } elsif (defined $makedepprog && $makedepprog !~ /\/makedepend/) {

          $recipe .= <<"EOF";

Configurations/windows-makefile.tmpl

+10 −0
Original line number Diff line number Diff line
@@ -319,6 +319,11 @@ build_apps build_tests: build_programs 
# Convenience target to prebuild all generated files, not just the mandatory

# ones

build_all_generated: $(GENERATED_MANDATORY) $(GENERATED)

	@rem {- output_off() if $disabled{makedepend}; "" -}

	@echo "Warning: consider configuring with no-makedepend, because if"

	@echo "         target system doesn't have $(PERL),"

	@echo "         then make will fail..."

	@rem {- output_on() if $disabled{makedepend}; "" -}



test: tests

{- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep
@@ -579,6 +584,11 @@ EOF 
         return <<"EOF";

$obj$objext: $deps

	\$(AS) $asflags \$(ASOUTFLAG)\$\@ $srcs

EOF

     } elsif ($srcs[0] =~ /.S$/) {

         return <<"EOF";

$obj$objext: $deps

	\$(CC) /EP /D__ASSEMBLER__ $cflags $srcs > \$@.asm && \$(AS) $asflags \$(ASOUTFLAG)\$\@ \$@.asm

EOF

     }

     return <<"EOF"	if (!$disabled{makedepend});