From: Dr. Stephen Henson Date: Sat, 24 Apr 1999 17:28:43 +0000 (+0000) Subject: Change the command line options of mkerr.pl so -static is now default and X-Git-Tag: OpenSSL_0_9_3beta1~252 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=73934800474e5b333af2bff0a8f79f13405fb500 Change the command line options of mkerr.pl so -static is now default and a -write option is needed to actually change anything. Second attempt at getting rid of ERR, ERRC definitions: it might even work this time :-) --- diff --git a/Makefile.org b/Makefile.org index 4397ef3343..0e9dfa35b5 100644 --- a/Makefile.org +++ b/Makefile.org @@ -263,7 +263,7 @@ tags: done; errors: - perl util/mkerr.pl -static -recurse + perl util/mkerr.pl -recurse -write tar: @gtar --no-recursion -cvf - \ diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index 2b847e5ead..d2219170d0 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -29,12 +29,11 @@ SDIRS= md2 md5 sha mdc2 hmac ripemd \ buffer bio stack lhash rand err objects \ evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp -ERRC=cpt_err GENERAL=Makefile README LIB= $(TOP)/libcrypto.a -LIBSRC= cryptlib.c mem.c cversion.c ex_data.c tmdiff.c $(ERRC).c -LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o $(ERRC).o +LIBSRC= cryptlib.c mem.c cversion.c ex_data.c tmdiff.c cpt_err.c +LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o cpt_err.o SRC= $(LIBSRC) diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl index 654720d0ae..87f392eeb3 100644 --- a/crypto/asn1/Makefile.ssl +++ b/crypto/asn1/Makefile.ssl @@ -15,7 +15,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=asn1_err GENERAL=Makefile README TEST= APPS= @@ -34,7 +33,7 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \ p7_dgst.c p7_s_e.c p7_enc.c p7_lib.c \ f_int.c f_string.c i2d_dhp.c i2d_dsap.c d2i_dhp.c d2i_dsap.c n_pkey.c \ f_enum.c a_hdr.c x_pkey.c a_bool.c x_exten.c \ - asn1_par.c asn1_lib.c $(ERRC).c a_meth.c a_bytes.c \ + asn1_par.c asn1_lib.c asn1_err.c a_meth.c a_bytes.c \ evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ a_print.o a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o a_bmp.o \ @@ -49,7 +48,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ p7_dgst.o p7_s_e.o p7_enc.o p7_lib.o \ f_int.o f_string.o i2d_dhp.o i2d_dsap.o d2i_dhp.o d2i_dsap.o n_pkey.o \ f_enum.o a_hdr.o x_pkey.o a_bool.o x_exten.o \ - asn1_par.o asn1_lib.o $(ERRC).o a_meth.o a_bytes.o \ + asn1_par.o asn1_lib.o asn1_err.o a_meth.o a_bytes.o \ evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o SRC= $(LIBSRC) diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl index 71dd686681..67f4aebcf1 100644 --- a/crypto/bio/Makefile.ssl +++ b/crypto/bio/Makefile.ssl @@ -15,18 +15,17 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=bio_err GENERAL=Makefile TEST= APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= bio_lib.c bio_cb.c $(ERRC).c \ +LIBSRC= bio_lib.c bio_cb.c bio_err.c \ bss_mem.c bss_null.c bss_fd.c \ bss_file.c bss_sock.c bss_conn.c \ bf_null.c bf_buff.c b_print.c b_dump.c \ b_sock.c bss_acpt.c bf_nbio.c bss_log.c -LIBOBJ= bio_lib.o bio_cb.o $(ERRC).o \ +LIBOBJ= bio_lib.o bio_cb.o bio_err.o \ bss_mem.o bss_null.o bss_fd.o \ bss_file.o bss_sock.o bss_conn.o \ bf_null.o bf_buff.o b_print.o b_dump.o \ diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl index 11e4f67de8..6cd865a683 100644 --- a/crypto/bn/Makefile.ssl +++ b/crypto/bn/Makefile.ssl @@ -19,7 +19,6 @@ BN_ASM= bn_asm.o CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=bn_err GENERAL=Makefile TEST=bntest.c exptest.c APPS= @@ -27,12 +26,12 @@ APPS= LIB=$(TOP)/libcrypto.a LIBSRC= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mul.c \ bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \ - bn_gcd.c bn_prime.c $(ERRC).c bn_sqr.c bn_asm.c bn_recp.c bn_mont.c \ + bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c bn_recp.c bn_mont.c \ bn_mpi.c bn_exp2.c LIBOBJ= bn_add.o bn_div.o bn_exp.o bn_lib.o bn_mul.o \ bn_print.o bn_rand.o bn_shift.o bn_word.o bn_blind.o \ - bn_gcd.o bn_prime.o $(ERRC).o bn_sqr.o $(BN_ASM) bn_recp.o bn_mont.o \ + bn_gcd.o bn_prime.o bn_err.o bn_sqr.o $(BN_ASM) bn_recp.o bn_mont.o \ bn_mpi.o bn_exp2.o SRC= $(LIBSRC) diff --git a/crypto/buffer/Makefile.ssl b/crypto/buffer/Makefile.ssl index e93e17bb7c..6580766a70 100644 --- a/crypto/buffer/Makefile.ssl +++ b/crypto/buffer/Makefile.ssl @@ -15,14 +15,13 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=buf_err GENERAL=Makefile TEST= APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= buffer.c $(ERRC).c -LIBOBJ= buffer.o $(ERRC).o +LIBSRC= buffer.c buf_err.c +LIBOBJ= buffer.o buf_err.o SRC= $(LIBSRC) diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl index 44c0293da2..38113fbf1a 100644 --- a/crypto/conf/Makefile.ssl +++ b/crypto/conf/Makefile.ssl @@ -15,15 +15,14 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=conf_err GENERAL=Makefile TEST= APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= conf.c $(ERRC).c +LIBSRC= conf.c conf_err.c -LIBOBJ= conf.o $(ERRC).o +LIBOBJ= conf.o conf_err.o SRC= $(LIBSRC) diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl index f0229e4740..1dfdd01543 100644 --- a/crypto/dh/Makefile.ssl +++ b/crypto/dh/Makefile.ssl @@ -15,14 +15,13 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=dh_err GENERAL=Makefile TEST= dhtest.c APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= dh_gen.c dh_key.c dh_lib.c dh_check.c $(ERRC).c -LIBOBJ= dh_gen.o dh_key.o dh_lib.o dh_check.o $(ERRC).o +LIBSRC= dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c +LIBOBJ= dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o SRC= $(LIBSRC) diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl index 28d6fabf6e..e80750b95b 100644 --- a/crypto/dsa/Makefile.ssl +++ b/crypto/dsa/Makefile.ssl @@ -15,14 +15,13 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=dsa_err GENERAL=Makefile TEST=dsatest.c APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c $(ERRC).c -LIBOBJ= dsa_gen.o dsa_key.o dsa_lib.o dsa_asn1.o dsa_vrf.o dsa_sign.o $(ERRC).o +LIBSRC= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c dsa_err.c +LIBOBJ= dsa_gen.o dsa_key.o dsa_lib.o dsa_asn1.o dsa_vrf.o dsa_sign.o dsa_err.o SRC= $(LIBSRC) diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl index e8e1e6f163..3491f2ceb3 100644 --- a/crypto/evp/Makefile.ssl +++ b/crypto/evp/Makefile.ssl @@ -15,7 +15,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=evp_err GENERAL=Makefile TEST= APPS= @@ -33,7 +32,7 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c \ m_null.c m_md2.c m_md5.c m_sha.c m_sha1.c m_dss.c m_dss1.c m_mdc2.c \ m_ripemd.c \ p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \ - bio_md.c bio_b64.c bio_enc.c $(ERRC).c e_null.c \ + bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \ c_all.c evp_lib.c bio_ok.c evp_pkey.c evp_pbe.c LIBOBJ= encode.o digest.o evp_enc.o evp_key.o \ @@ -48,7 +47,7 @@ LIBOBJ= encode.o digest.o evp_enc.o evp_key.o \ m_null.o m_md2.o m_md5.o m_sha.o m_sha1.o m_dss.o m_dss1.o m_mdc2.o \ m_ripemd.o \ p_open.o p_seal.o p_sign.o p_verify.o p_lib.o p_enc.o p_dec.o \ - bio_md.o bio_b64.o bio_enc.o $(ERRC).o e_null.o \ + bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \ c_all.o evp_lib.o bio_ok.o evp_pkey.o evp_pbe.o SRC= $(LIBSRC) diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl index b2e452a053..e139fe41ea 100644 --- a/crypto/objects/Makefile.ssl +++ b/crypto/objects/Makefile.ssl @@ -15,14 +15,13 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=obj_err GENERAL=Makefile README TEST= APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= o_names.c obj_dat.c obj_lib.c $(ERRC).c -LIBOBJ= o_names.o obj_dat.o obj_lib.o $(ERRC).o +LIBSRC= o_names.c obj_dat.c obj_lib.c obj_err.c +LIBOBJ= o_names.o obj_dat.o obj_lib.o obj_err.o SRC= $(LIBSRC) diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl index dd1c14dbe3..3582404cf4 100644 --- a/crypto/pem/Makefile.ssl +++ b/crypto/pem/Makefile.ssl @@ -15,15 +15,14 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=pem_err GENERAL=Makefile TEST= APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c $(ERRC).c +LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c -LIBOBJ= pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o $(ERRC).o +LIBOBJ= pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o pem_err.o SRC= $(LIBSRC) diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl index 72dcdc9ebf..9487b6f514 100644 --- a/crypto/rsa/Makefile.ssl +++ b/crypto/rsa/Makefile.ssl @@ -15,15 +15,14 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=rsa_err GENERAL=Makefile TEST=rsa_oaep_test.c APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c $(ERRC).c \ +LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \ rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c -LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o $(ERRC).o \ +LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o \ rsa_pk1.o rsa_ssl.o rsa_none.o rsa_oaep.o SRC= $(LIBSRC) diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl index ba809614dc..c724a74f9b 100644 --- a/crypto/x509/Makefile.ssl +++ b/crypto/x509/Makefile.ssl @@ -15,7 +15,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=x509_err GENERAL=Makefile README TEST= APPS= @@ -23,13 +22,13 @@ APPS= LIB=$(TOP)/libcrypto.a LIBSRC= x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \ x509_obj.c x509_req.c x509_vfy.c \ - x509_set.c x509rset.c $(ERRC).c \ + x509_set.c x509rset.c x509_err.c \ x509name.c x509_v3.c x509_ext.c \ x509type.c x509_lu.c x_all.c x509_txt.c \ by_file.c by_dir.c LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \ x509_obj.o x509_req.o x509_vfy.o \ - x509_set.o x509rset.o $(ERRC).o \ + x509_set.o x509rset.o x509_err.o \ x509name.o x509_v3.o x509_ext.o \ x509type.o x509_lu.o x_all.o x509_txt.o \ by_file.o by_dir.o diff --git a/rsaref/Makefile.ssl b/rsaref/Makefile.ssl index a45b4939a6..6f0ef04ec4 100644 --- a/rsaref/Makefile.ssl +++ b/rsaref/Makefile.ssl @@ -15,14 +15,13 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=rsar_err GENERAL=Makefile TEST= APPS= LIB=$(TOP)/libRSAglue.a -LIBSRC= rsaref.c $(ERRC).c -LIBOBJ= rsaref.o $(ERRC).o +LIBSRC= rsaref.c rsar_err.c +LIBOBJ= rsaref.o rsar_err.o SRC= $(LIBSRC) diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl index 7f3bbb258c..c129a9d530 100644 --- a/ssl/Makefile.ssl +++ b/ssl/Makefile.ssl @@ -15,7 +15,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -ERRC=ssl_err GENERAL=Makefile README TEST=ssltest.c APPS= @@ -29,7 +28,7 @@ LIBSRC= \ ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \ ssl_ciph.c ssl_stat.c ssl_rsa.c \ ssl_asn1.c ssl_txt.c ssl_algs.c \ - bio_ssl.c $(ERRC).c + bio_ssl.c ssl_err.c LIBOBJ= \ s2_meth.o s2_srvr.o s2_clnt.o s2_lib.o s2_enc.o s2_pkt.o \ s3_meth.o s3_srvr.o s3_clnt.o s3_lib.o s3_enc.o s3_pkt.o s3_both.o \ @@ -38,7 +37,7 @@ LIBOBJ= \ ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o \ ssl_ciph.o ssl_stat.o ssl_rsa.o \ ssl_asn1.o ssl_txt.o ssl_algs.o \ - bio_ssl.o $(ERRC).o + bio_ssl.o ssl_err.o SRC= $(LIBSRC) diff --git a/util/mkerr.pl b/util/mkerr.pl index 0293b0be7d..ccf766b9a0 100644 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -3,9 +3,10 @@ my $config = "crypto/err/openssl.ec"; my $debug = 0; my $rebuild = 0; -my $static = 0; +my $static = 1; my $recurse = 0; my $reindex = 0; +my $dowrite = 0; while (@ARGV) { @@ -25,8 +26,11 @@ while (@ARGV) { } elsif($arg eq "-reindex") { $reindex = 1; shift @ARGV; - } elsif($arg eq "-static") { - $static = 1; + } elsif($arg eq "-nostatic") { + $static = 0; + shift @ARGV; + } elsif($arg eq "-write") { + $dowrite = 1; shift @ARGV; } else { last; @@ -210,7 +214,7 @@ foreach $lib (keys %csrc) } else { print STDERR "$lib:\t\t$fnew{$lib} New Functions,"; print STDERR " $rnew{$lib} New Reasons.\n"; - + next unless $dowrite; } # If we get here then we have some new error codes so we