diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2011-04-01 14:49:30 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2011-04-01 14:49:30 +0000 |
commit | 3f7468318dc56f34e1c5e98049b70558fea586b0 (patch) | |
tree | eb68b679d96b456c0fd11f5d5c8e176c9d86e8e7 /crypto/Makefile | |
parent | 011c865640fb6edd3e810326a2c331b29759e87d (diff) | |
download | openssl-3f7468318dc56f34e1c5e98049b70558fea586b0.tar.gz |
Provisional support for auto called OPENSSL_init() function. This can be
used to set up any appropriate functions such as FIPS callbacks without
requiring an explicit application call.
Diffstat (limited to 'crypto/Makefile')
-rw-r--r-- | crypto/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index be0cf890b0..faacc01a54 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -34,8 +34,12 @@ GENERAL=Makefile README crypto-lib.com install.com LIB= $(TOP)/libcrypto.a SHARED_LIB= libcrypto$(SHLIB_EXT) -LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c thr_id.c lock.c fips_ers.c -LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o thr_id.o lock.o fips_ers.o $(CPUID_OBJ) +LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \ + ebcdic.c uid.c o_time.c o_str.c o_dir.c thr_id.c lock.c fips_ers.c \ + o_init.c +LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \ + ebcdic.o uid.o o_time.o o_str.o o_dir.o thr_id.o lock.o fips_ers.o \ + o_init.o $(CPUID_OBJ) SRC= $(LIBSRC) @@ -84,6 +88,9 @@ pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@ alphacpuid.s: alphacpuid.pl $(PERL) $< | $(CC) -E - | tee $@ > /dev/null +o_init.o: o_init.c + $(CC) $(CFLAGS) -c -o $@ $< + testapps: [ -z "$(THIS)" ] || ( if expr " $(SDIRS) " : ".* des " >/dev/null; \ then cd des && $(MAKE) -e des; fi ) |