Move eng_padlock.c to ./engines.

Submitted by: Michal Ludvig <michal@logix.cz>

diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile
index a292122e817fc7e832a505e93b4918fb43131a46..775ae76bafdf1ff3868ab19e0c6794ce561d1b5c 100644 (file)
--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@@ -21,12 +21,12 @@ LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
        eng_table.c eng_pkey.c eng_fat.c eng_all.c \
        tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \
        tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \
-       eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c
+       eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c
 LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \
        eng_table.o eng_pkey.o eng_fat.o eng_all.o \
        tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \
        tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \
-       eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o
+       eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o
 
 SRC= $(LIBSRC)
 
@@ -182,17 +182,6 @@ eng_openssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 eng_openssl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 eng_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 eng_openssl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_openssl.c
-eng_padlock.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
-eng_padlock.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-eng_padlock.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
-eng_padlock.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-eng_padlock.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-eng_padlock.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-eng_padlock.o: ../../include/openssl/opensslconf.h
-eng_padlock.o: ../../include/openssl/opensslv.h
-eng_padlock.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-eng_padlock.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-eng_padlock.o: ../../include/openssl/symhacks.h eng_padlock.c
 eng_pkey.o: ../../e_os.h ../../include/openssl/bio.h
 eng_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 eng_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

diff --git a/engines/Makefile b/engines/Makefile
index f9bd86ec99792015963cd066f097c61172bb93fa..2454f3ba5ed6d224e51da5331a7cd906512a3649 100644 (file)
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -26,7 +26,7 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec
+LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock
 
 LIBSRC=        e_4758cca.c \
        e_aep.c \
@@ -36,7 +36,8 @@ LIBSRC=       e_4758cca.c \
        e_chil.c \
        e_nuron.c \
        e_sureware.c \
-       e_ubsec.c
+       e_ubsec.c \
+       e_padlock.c
 LIBOBJ= e_4758cca.o \
        e_aep.o \
        e_atalla.o \
@@ -45,7 +46,8 @@ LIBOBJ= e_4758cca.o \
        e_chil.o \
        e_nuron.o \
        e_sureware.o \
-       e_ubsec.o
+       e_ubsec.o \
+       e_padlock.o
 
 SRC= $(LIBSRC)
 
@@ -235,6 +237,16 @@ e_nuron.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 e_nuron.o: ../include/openssl/ossl_typ.h ../include/openssl/rsa.h
 e_nuron.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 e_nuron.o: ../include/openssl/symhacks.h e_nuron.c e_nuron_err.c e_nuron_err.h
+e_padlock.o: ../include/openssl/aes.h ../include/openssl/asn1.h
+e_padlock.o: ../include/openssl/bio.h ../include/openssl/crypto.h
+e_padlock.o: ../include/openssl/dso.h ../include/openssl/e_os2.h
+e_padlock.o: ../include/openssl/engine.h ../include/openssl/err.h
+e_padlock.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+e_padlock.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+e_padlock.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_padlock.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+e_padlock.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+e_padlock.o: ../include/openssl/symhacks.h e_padlock.c
 e_sureware.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 e_sureware.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 e_sureware.o: ../include/openssl/crypto.h ../include/openssl/dh.h

diff --git a/crypto/engine/eng_padlock.c b/engines/e_padlock.c
similarity index 100%
rename from crypto/engine/eng_padlock.c
rename to engines/e_padlock.c