summaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2009-04-27 00:08:50 +0000
committerRichard Levitte <levitte@openssl.org>2009-04-27 00:08:50 +0000
commit226a94963af40436104dcbf1f1c4963df046d508 (patch)
tree8ed1b46047b40d69376bc828d4ccdff705e9e069 /engines
parentd7f0d147b1a36407d8a5569aac48dde5a5b8854c (diff)
downloadopenssl-new-226a94963af40436104dcbf1f1c4963df046d508.tar.gz
Updates from HEAD
Diffstat (limited to 'engines')
-rw-r--r--engines/makeengines.com27
1 files changed, 15 insertions, 12 deletions
diff --git a/engines/makeengines.com b/engines/makeengines.com
index 1125dacc07..42b0ae050d 100644
--- a/engines/makeengines.com
+++ b/engines/makeengines.com
@@ -87,6 +87,7 @@ $ ENGINE_chil = "e_chil"
$ ENGINE_nuron = "e_nuron"
$ ENGINE_sureware = "e_sureware"
$ ENGINE_ubsec = "e_ubsec"
+$ ENGINE_ubsec = "e_padlock"
$
$ ENGINE_ccgost_SUBDIR = "ccgost"
$ ENGINE_ccgost = "e_gost_err,gost2001_keyx,gost2001,gost89,gost94_keyx,"+ -
@@ -139,6 +140,10 @@ $ ELSE
$ WRITE SYS$OUTPUT "Compiling Support Files. (",BUILDALL,")"
$ ENDIF
$!
+$! Create a .OPT file for the object files
+$!
+$ OPEN/WRITE OBJECTS 'EXE_DIR''ENGINE_NAME'.OPT
+$!
$! Here's the start of per-engine module loop.
$!
$ FILE_COUNTER = 0
@@ -189,6 +194,14 @@ $ MACRO/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
$ ELSE
$ CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
$ ENDIF
+$ WRITE OBJECTS OBJECT_FILE
+$!
+$! Next file
+$!
+$ GOTO FILE_NEXT
+$!
+$ FILE_DONE:
+$ CLOSE OBJECTS
$!
$! Now, there are two ways to handle this. We can either build
$! shareable images or stick the engine object file into libcrypto.
@@ -203,26 +216,16 @@ $ ENGINE_OPT := SYS$DISK:[]'ARCH'.OPT
$ IF TCPIP_LIB .NES. ""
$ THEN
$ LINK/'DEBUGGER'/'TRACEBACK' /SHARE='EXE_DIR''ENGINE_NAME'.EXE -
- 'OBJECT_FILE''EXTRA_OBJ', -
+ 'EXE_DIR''ENGINE_NAME'.OPT/OPTION'EXTRA_OBJ', -
'CRYPTO_LIB'/LIBRARY, -
'ENGINE_OPT'/OPTION,'TCPIP_LIB','OPT_FILE'/OPTION
$ ELSE
$ LINK/'DEBUGGER'/'TRACEBACK' /SHARE='EXE_DIR''ENGINE_NAME'.EXE -
- 'OBJECT_FILE''EXTRA_OBJ', -
+ 'EXE_DIR''ENGINE_NAME'.OPT/OPTION'EXTRA_OBJ', -
'CRYPTO_LIB'/LIBRARY, -
'ENGINE_OPT'/OPTION,'OPT_FILE'/OPTION
$ ENDIF
$!
-$! Clean up
-$!
-$ DELETE 'OBJECT_FILE';*
-$!
-$! Next file
-$!
-$ GOTO FILE_NEXT
-$!
-$ FILE_DONE:
-$!
$! Next engine
$!
$ GOTO ENGINE_NEXT