ui_compat cleanup; makefiles and vms

Remove ui_compat.h from Makefile dependencies
And from two VMS build/install scripts.

Reviewed-by: Matt Caswell <matt@openssl.org>

diff --git a/apps/Makefile b/apps/Makefile
index 3af50b19ff74e5458c394f2c782d81d82991b202..12a72e0fe71391f8ff260cef0d013bbd54051775 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -605,7 +605,7 @@ passwd.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 passwd.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 passwd.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 passwd.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
-passwd.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
+passwd.o: ../include/openssl/x509.h
 passwd.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
 passwd.o: passwd.c
 pkcs12.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -954,7 +954,7 @@ speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 speed.o: ../include/openssl/seed.h ../include/openssl/sha.h
 speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
-speed.o: ../include/openssl/ui_compat.h ../include/openssl/whrlpool.h
+speed.o: ../include/openssl/whrlpool.h
 speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 speed.o: ../include/openssl/x509v3.h apps.h speed.c testdsa.h testrsa.h
 spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -1037,7 +1037,7 @@ version.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
 version.o: ../include/openssl/rc4.h ../include/openssl/safestack.h
 version.o: ../include/openssl/sha.h ../include/openssl/stack.h
 version.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-version.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
+version.o: ../include/openssl/ui.h
 version.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 version.o: ../include/openssl/x509v3.h apps.h version.c
 x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

diff --git a/crypto/des/Makefile b/crypto/des/Makefile
index e906ff3e743dbdc5d3c3a4ce1f1c78e93eb2e3aa..eb955cf8c651ac4e4966a23a56ae6d611076914d 100644 (file)
--- a/crypto/des/Makefile
+++ b/crypto/des/Makefile
@@ -110,45 +110,45 @@ cbc_cksm.o: ../../include/openssl/des.h
 cbc_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 cbc_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+cbc_cksm.o: ../../include/openssl/ui.h
 cbc_cksm.o: cbc_cksm.c des_locl.h
 cbc_enc.o: ../../include/openssl/des.h
 cbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 cbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 cbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+cbc_enc.o: ../../include/openssl/ui.h
 cbc_enc.o: cbc_enc.c des_locl.h ncbc_enc.c
 cfb64ede.o: ../../e_os.h ../../include/openssl/des.h
 cfb64ede.o: ../../include/openssl/e_os2.h
 cfb64ede.o: ../../include/openssl/opensslconf.h
 cfb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+cfb64ede.o: ../../include/openssl/ui.h
 cfb64ede.o: cfb64ede.c des_locl.h
 cfb64enc.o: ../../include/openssl/des.h
 cfb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 cfb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+cfb64enc.o: ../../include/openssl/ui.h
 cfb64enc.o: cfb64enc.c des_locl.h
 cfb_enc.o: ../../e_os.h ../../include/openssl/des.h
 cfb_enc.o: ../../include/openssl/e_os2.h
 cfb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/ossl_typ.h
 cfb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 cfb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-cfb_enc.o: ../../include/openssl/ui_compat.h cfb_enc.c des_locl.h
+cfb_enc.o: cfb_enc.c des_locl.h
 des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 des_enc.o: ../../include/openssl/e_os2.h
 des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+des_enc.o: ../../include/openssl/ui.h 
 des_enc.o: des_enc.c des_locl.h ncbc_enc.c spr.h
 ecb3_enc.o: ../../include/openssl/des.h
 ecb3_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 ecb3_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+ecb3_enc.o: ../../include/openssl/ui.h 
 ecb3_enc.o: des_locl.h ecb3_enc.c
 ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 ecb_enc.o: ../../include/openssl/des.h
@@ -156,7 +156,7 @@ ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h ecb_enc.c
+ecb_enc.o: des_locl.h des_ver.h ecb_enc.c
 enc_read.o: ../../e_os.h ../../include/openssl/bio.h
 enc_read.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 enc_read.o: ../../include/openssl/des.h
@@ -165,7 +165,7 @@ enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 enc_read.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 enc_read.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-enc_read.o: ../../include/openssl/ui_compat.h ../cryptlib.h des_locl.h
+enc_read.o: ../cryptlib.h des_locl.h
 enc_read.o: enc_read.c
 enc_writ.o: ../../e_os.h ../../include/openssl/bio.h
 enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -175,87 +175,87 @@ enc_writ.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 enc_writ.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-enc_writ.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+enc_writ.o: ../../include/openssl/ui.h
 enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c
 fcrypt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 fcrypt.o: ../../include/openssl/e_os2.h
 fcrypt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 fcrypt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 fcrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fcrypt.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+fcrypt.o: ../../include/openssl/ui.h
 fcrypt.o: des_locl.h fcrypt.c
 fcrypt_b.o: ../../include/openssl/des.h
 fcrypt_b.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 fcrypt_b.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+fcrypt_b.o: ../../include/openssl/ui.h
 fcrypt_b.o: des_locl.h fcrypt_b.c
 ofb64ede.o: ../../include/openssl/des.h
 ofb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 ofb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+ofb64ede.o: ../../include/openssl/ui.h
 ofb64ede.o: des_locl.h ofb64ede.c
 ofb64enc.o: ../../include/openssl/des.h
 ofb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 ofb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+ofb64enc.o: ../../include/openssl/ui.h
 ofb64enc.o: des_locl.h ofb64enc.c
 ofb_enc.o: ../../include/openssl/des.h
 ofb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 ofb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 ofb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ofb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+ofb_enc.o: ../../include/openssl/ui.h
 ofb_enc.o: des_locl.h ofb_enc.c
 pcbc_enc.o: ../../include/openssl/des.h
 pcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 pcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+pcbc_enc.o: ../../include/openssl/ui.h
 pcbc_enc.o: des_locl.h pcbc_enc.c
 qud_cksm.o: ../../include/openssl/des.h
 qud_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 qud_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+qud_cksm.o: ../../include/openssl/ui.h
 qud_cksm.o: des_locl.h qud_cksm.c
 rand_key.o: ../../include/openssl/des.h
 rand_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 rand_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
 rand_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 rand_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-rand_key.o: ../../include/openssl/ui_compat.h rand_key.c
+rand_key.o: rand_key.c
 read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 read2pwd.o: ../../include/openssl/e_os2.h
 read2pwd.o: ../../include/openssl/opensslconf.h
 read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 read2pwd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 read2pwd.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-read2pwd.o: ../../include/openssl/ui_compat.h read2pwd.c
+read2pwd.o: read2pwd.c
 rpc_enc.o: ../../include/openssl/des.h
 rpc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+rpc_enc.o: ../../include/openssl/ui.h
 rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c
 set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 set_key.o: ../../include/openssl/e_os2.h
 set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-set_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+set_key.o: ../../include/openssl/ui.h
 set_key.o: des_locl.h set_key.c
 str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 str2key.o: ../../include/openssl/e_os2.h
 str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 str2key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 str2key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-str2key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+str2key.o: ../../include/openssl/ui.h
 str2key.o: des_locl.h str2key.c
 xcbc_enc.o: ../../include/openssl/des.h
 xcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 xcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+xcbc_enc.o: ../../include/openssl/ui.h
 xcbc_enc.o: des_locl.h xcbc_enc.c

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 925b094af5dde75605936643d33166a11bb19de7..ccaa6c89c72a84c8b3605a9fdc7c661ec756aa3e 100644 (file)
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -271,7 +271,7 @@ e_des.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_des.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
 e_des.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 e_des.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-e_des.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_des.c evp_locl.h
+e_des.o: ../cryptlib.h e_des.c evp_locl.h
 e_des3.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_des3.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 e_des3.o: ../../include/openssl/des.h
@@ -282,7 +282,7 @@ e_des3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_des3.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
 e_des3.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 e_des3.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-e_des3.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+e_des3.o: ../../include/openssl/ui.h
 e_des3.o: ../cryptlib.h e_des3.c evp_locl.h
 e_idea.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_idea.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -358,7 +358,7 @@ e_xcbc_d.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 e_xcbc_d.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 e_xcbc_d.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-e_xcbc_d.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_xcbc_d.c
+e_xcbc_d.o: ../cryptlib.h e_xcbc_d.c
 e_xcbc_d.o: evp_locl.h
 encode.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 encode.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -530,7 +530,7 @@ m_mdc2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
 m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_mdc2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-m_mdc2.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
+m_mdc2.o: ../../include/openssl/x509.h
 m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_mdc2.c
 m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

diff --git a/crypto/install-crypto.com b/crypto/install-crypto.com
index a43f43390e28ba1c24b81632bd64adacd6daaad0..7734f945a82b3f15a372564cf02244de0d107715 100755 (executable)
--- a/crypto/install-crypto.com
+++ b/crypto/install-crypto.com
@@ -131,7 +131,7 @@ $ exheader_pkcs7 := pkcs7.h
 $ exheader_pkcs12 := pkcs12.h
 $ exheader_comp := comp.h
 $ exheader_ocsp := ocsp.h
-$ exheader_ui := ui.h, ui_compat.h
+$ exheader_ui := ui.h
 $ exheader_krb5 := krb5_asn.h
 $ exheader_cms := cms.h
 $ exheader_pqueue := pqueue.h

diff --git a/crypto/mdc2/Makefile b/crypto/mdc2/Makefile
index 0e6697865a68d01a962b41e17900adf0f5e4f6be..7811764085ddd2fc94617b8180dd77b48e3e91e0 100644 (file)
--- a/crypto/mdc2/Makefile
+++ b/crypto/mdc2/Makefile
@@ -83,11 +83,11 @@ mdc2_one.o: ../../include/openssl/opensslconf.h
 mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 mdc2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 mdc2_one.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-mdc2_one.o: ../../include/openssl/ui_compat.h ../cryptlib.h mdc2_one.c
+mdc2_one.o: ../cryptlib.h mdc2_one.c
 mdc2dgst.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 mdc2dgst.o: ../../include/openssl/e_os2.h
 mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h
 mdc2dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 mdc2dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 mdc2dgst.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-mdc2dgst.o: ../../include/openssl/ui_compat.h mdc2dgst.c
+mdc2dgst.o: mdc2dgst.c

diff --git a/crypto/pem/Makefile b/crypto/pem/Makefile
index 9ac00b9be812acb680dd04b869a4c83b969976e4..3664055f719ab2070fce1c5aea0c0c2a832c0033 100644 (file)
--- a/crypto/pem/Makefile
+++ b/crypto/pem/Makefile
@@ -135,7 +135,7 @@ pem_lib.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 pem_lib.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 pem_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 pem_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-pem_lib.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
+pem_lib.o: ../../include/openssl/x509.h
 pem_lib.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h
 pem_lib.o: pem_lib.c
 pem_oth.o: ../../e_os.h ../../include/openssl/asn1.h

diff --git a/makevms.com b/makevms.com
index 6a73441b33555cf50605d9e9622f7bf405fee080..0f403db1d56340fb04f79cc5dea220d8dbd6cd1f 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -830,7 +830,7 @@ $ EXHEADER_PKCS7 := pkcs7.h
 $ EXHEADER_PKCS12 := pkcs12.h
 $ EXHEADER_COMP := comp.h
 $ EXHEADER_OCSP := ocsp.h
-$ EXHEADER_UI := ui.h, ui_compat.h
+$ EXHEADER_UI := ui.h
 $ EXHEADER_KRB5 := krb5_asn.h
 $ EXHEADER_CMS := cms.h
 $ EXHEADER_PQUEUE := pqueue.h

diff --git a/test/Makefile b/test/Makefile
index fa5bd9f9e9ff66ed0acdb49c139b70cf2d768483..4dfe892fd8f48814b45cf278dbfd18de200296f0 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -574,7 +574,7 @@ destest.o: ../include/openssl/des.h
 destest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
 destest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 destest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-destest.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h destest.c
+destest.o: ../include/openssl/ui.h destest.c
 dhtest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/bn.h
 dhtest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
 dhtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
@@ -742,7 +742,7 @@ mdc2test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 mdc2test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 mdc2test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 mdc2test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-mdc2test.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h mdc2test.c
+mdc2test.o: ../include/openssl/ui.h mdc2test.c
 p5_crpt2_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 p5_crpt2_test.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 p5_crpt2_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h