Unified - adapt the generation of padlock assembler to use GENERATE

This gets rid of the BEGINRAW..ENDRAW sections in engines/build.info.

This also moves the assembler generating perl scripts to take the
output file name as last command line argument, where necessary.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/engines/Makefile.in b/engines/Makefile.in
index 1645ad52168ca8ee4e8a32d5670bd4f078766325..cc614278fc0e91e3f4a68969445454017ad0c1f2 100644 (file)
--- a/engines/Makefile.in
+++ b/engines/Makefile.in
@@ -72,9 +72,9 @@ lib:  $(LIBOBJ) $(TESTLIBOBJ)
        touch lib
 
 e_padlock-x86.s:       asm/e_padlock-x86.pl
-       $(PERL) asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+       $(PERL) asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@
 e_padlock-x86_64.s:    asm/e_padlock-x86_64.pl
-       $(PERL) asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) > $@
+       $(PERL) asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) $@
 
 subdirs:
        @target=all; $(RECURSIVE_MAKE)

diff --git a/engines/build.info b/engines/build.info
index b401ab0e93c85c2d6f7ea725532542022fdba496..c8fba262969ee7bd79dad7988ea79c015787cae4 100644 (file)
--- a/engines/build.info
+++ b/engines/build.info
@@ -21,9 +21,5 @@ ELSE
  INCLUDE[ossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include
 ENDIF
 
-BEGINRAW[Makefile]
-{- $builddir -}/e_padlock-x86.s:       {- $sourcedir -}/asm/e_padlock-x86.pl
-       CC="$(CC)" $(PERL) {- $sourcedir -}/asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
-{- $builddir -}/e_padlock-x86_64.s:    {- $sourcedir -}/asm/e_padlock-x86_64.pl
-       CC="$(CC)" $(PERL) {- $sourcedir -}/asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) > $@
-ENDRAW[Makefile]
+GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
+GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME)