Commit 73934800 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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 :-)
parent 50cfd175

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ tags: 
	done;



errors:

	perl util/mkerr.pl -static -recurse

	perl util/mkerr.pl -recurse -write



tar:

	@gtar --no-recursion -cvf - \

crypto/Makefile.ssl

+2 −3
Original line number Diff line number Diff line
@@ -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)

crypto/asn1/Makefile.ssl

+2 −3
Original line number Diff line number Diff line
@@ -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)

crypto/bio/Makefile.ssl

+2 −3
Original line number Diff line number Diff line
@@ -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 \

crypto/bn/Makefile.ssl

+2 −3
Original line number Diff line number Diff line
@@ -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)