Move padlock_asm_src file information to build.info files

[openssl.git] / engines / build.info

diff --git a/engines/build.info b/engines/build.info
index 16907da50af45f56d9e71fea33faee896da53ee3..77aab6d525836b1cb07bb60fbeafbdebd2d1897c 100644 (file)
--- a/engines/build.info
+++ b/engines/build.info
@@ -1,9 +1,22 @@
 IF[{- !$disabled{"engine"} -}]
+  $PADLOCKASM=
+  IF[{- !$disabled{asm} -}]
+    $PADLOCKASM_x86=e_padlock-x86.s
+    $PADLOCKASM_x86_64=e_padlock-x86_64.s
+
+    # Now that we have defined all the arch specific variables, use the
+    # appropriate one, and define the appropriate macros
+    IF[$PADLOCKASM_{- $target{asm_arch} -}]
+      $PADLOCKASM=$PADLOCKASM_{- $target{asm_arch} -}
+      $PADLOCKDEF=PADLOCK_ASM
+    ENDIF
+  ENDIF
+
   IF[{- $disabled{"dynamic-engine"} -}]
     LIBS=../libcrypto
     IF[{- !$disabled{padlockeng} -}]
-      SOURCE[../libcrypto]=\
-              e_padlock.c {- $target{padlock_asm_src} -}
+      SOURCE[../libcrypto]=e_padlock.c $PADLOCKASM
+      DEFINE[../libcrypto]=$PADLOCKDEF
     ENDIF
     IF[{- !$disabled{capieng} -}]
       SOURCE[../libcrypto]=e_capi.c
@@ -17,11 +30,12 @@ IF[{- !$disabled{"engine"} -}]
   ELSE
     IF[{- !$disabled{padlockeng} -}]
       MODULES{engine}=padlock
-      SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -}
+      SOURCE[padlock]=e_padlock.c $PADLOCKASM
+      DEFINE[padlock]=$PADLOCKDEF
       DEPEND[padlock]=../libcrypto
       INCLUDE[padlock]=../include
       IF[{- defined $target{shared_defflag} -}]
-        SHARED_SOURCE[padlock]=padlock.ld
+        SOURCE[padlock]=padlock.ld
         GENERATE[padlock.ld]=../util/engines.num
       ENDIF
     ENDIF
@@ -31,7 +45,7 @@ IF[{- !$disabled{"engine"} -}]
       DEPEND[capi]=../libcrypto
       INCLUDE[capi]=../include
       IF[{- defined $target{shared_defflag} -}]
-        SHARED_SOURCE[capi]=capi.ld
+        SOURCE[capi]=capi.ld
         GENERATE[capi.ld]=../util/engines.num
       ENDIF
     ENDIF
@@ -41,7 +55,7 @@ IF[{- !$disabled{"engine"} -}]
       DEPEND[afalg]=../libcrypto
       INCLUDE[afalg]= ../include
       IF[{- defined $target{shared_defflag} -}]
-        SHARED_SOURCE[afalg]=afalg.ld
+        SOURCE[afalg]=afalg.ld
         GENERATE[afalg.ld]=../util/engines.num
       ENDIF
     ENDIF
@@ -51,7 +65,7 @@ IF[{- !$disabled{"engine"} -}]
       DEPEND[devcrypto]=../libcrypto
       INCLUDE[devcrypto]=../include
       IF[{- defined $target{shared_defflag} -}]
-        SHARED_SOURCE[devcrypto]=devcrypto.ld
+        SOURCE[devcrypto]=devcrypto.ld
         GENERATE[devcrypto.ld]=../util/engines.num
       ENDIF
     ENDIF
@@ -61,14 +75,14 @@ IF[{- !$disabled{"engine"} -}]
     DEPEND[dasync]=../libcrypto
     INCLUDE[dasync]=../include
     IF[{- defined $target{shared_defflag} -}]
-      SHARED_SOURCE[dasync]=dasync.ld
+      SOURCE[dasync]=dasync.ld
       GENERATE[dasync.ld]=../util/engines.num
     ENDIF
     SOURCE[ossltest]=e_ossltest.c
     DEPEND[ossltest]=../libcrypto
     INCLUDE[ossltest]=../include
     IF[{- defined $target{shared_defflag} -}]
-      SHARED_SOURCE[ossltest]=ossltest.ld
+      SOURCE[ossltest]=ossltest.ld
       GENERATE[ossltest.ld]=../util/engines.num
     ENDIF
   ENDIF