X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2FMakefile;h=b2cf528a91046cb945808d9d8a74ac568de153c1;hp=819b1cc8b3a9923121073350365c3e7eebfb1d23;hb=74924dcb3802640d7e2ae2e80ca6515d0a53de7a;hpb=5fe736e5fc29353706c2c1a5ae8bd97f3d7a35e9 diff --git a/crypto/Makefile b/crypto/Makefile index 819b1cc8b3..b2cf528a91 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -5,9 +5,9 @@ DIR= crypto TOP= .. CC= cc -INCLUDE= -I. -I$(TOP) -I../include $(ZLIB_INCLUDE) +INCLUDE= -I. -I$(TOP) -I../include -Iinclude $(ZLIB_INCLUDE) # INCLUDES targets sudbirs! -INCLUDES= -I.. -I../.. -I../modes -I../evp -I../include -I../../include $(ZLIB_INCLUDE) +INCLUDES= -I.. -I../.. -I../modes -I../include -I../../include $(ZLIB_INCLUDE) CFLAG= -g MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) @@ -31,25 +31,21 @@ CPUID_OBJ=mem_clr.o LIBS= GENERAL=Makefile README crypto-lib.com install.com -TEST=constant_time_test.c 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 \ - o_init.c o_fips.c + o_init.c o_fips.c sec_mem.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 o_fips.o $(CPUID_OBJ) + o_init.o o_fips.o sec_mem.o $(CPUID_OBJ) SRC= $(LIBSRC) -EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \ - ossl_typ.h -HEADER= cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h \ - constant_time_locl.h $(EXHEADER) +HEADER= buildinf.h arm_arch.h ppc_arch.h sparc_arch.h -ALL= $(GENERAL) $(SRC) $(HEADER) +ALL= $(GENERAL) $(SRC) $(HEADER) top: @(cd ..; $(MAKE) DIRS=$(DIR) all) @@ -87,6 +83,7 @@ alphacpuid.s: alphacpuid.pl $(PERL) alphacpuid.pl > $$preproc && \ $(CC) -E -P $$preproc > $@ && rm $$preproc) arm64cpuid.S: arm64cpuid.pl; $(PERL) arm64cpuid.pl $(PERLASM_SCHEME) > $@ +armv4cpuid.S: armv4cpuid.pl; $(PERL) armv4cpuid.pl $(PERLASM_SCHEME) > $@ subdirs: @target=all; $(RECURSIVE_MAKE) @@ -95,12 +92,6 @@ files: $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO @target=files; $(RECURSIVE_MAKE) -links: - @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) - @target=links; $(RECURSIVE_MAKE) - # lib: $(LIB): are splitted to avoid end-less loop lib: $(LIB) @touch lib @@ -116,26 +107,20 @@ shared: buildinf.h lib subdirs libs: @target=lib; $(RECURSIVE_MAKE) -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ;\ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - @target=install; $(RECURSIVE_MAKE) - -uninstall: - lint: @target=lint; $(RECURSIVE_MAKE) -depend: +update: local_depend + @[ -z "$(THIS)" ] || (set -e; target=update; $(RECURSIVE_MAKE) ) + @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi + +depend: local_depend + @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) ) + @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi +local_depend: @[ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake buildinf.h if it does not exist @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC) @[ -z "$(THIS)" -o -s buildinf.h ] || rm buildinf.h - @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) ) - @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi clean: rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff @@ -160,37 +145,37 @@ cryptlib.o: ../include/openssl/err.h ../include/openssl/lhash.h cryptlib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h cryptlib.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h cryptlib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.c -cryptlib.o: cryptlib.h +cryptlib.o: include/internal/cryptlib.h cversion.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h cversion.o: ../include/openssl/err.h ../include/openssl/lhash.h cversion.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h cversion.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h cversion.o: ../include/openssl/stack.h ../include/openssl/symhacks.h buildinf.h -cversion.o: cryptlib.h cversion.c +cversion.o: cversion.c include/internal/cryptlib.h ebcdic.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h ebcdic.c ex_data.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h ex_data.o: ../include/openssl/err.h ../include/openssl/lhash.h ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h ex_data.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h -ex_data.o: ex_data.c +ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h ex_data.c +ex_data.o: include/internal/cryptlib.h fips_ers.o: ../include/openssl/opensslconf.h fips_ers.c lock.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h lock.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h lock.o: ../include/openssl/err.h ../include/openssl/lhash.h lock.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h lock.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -lock.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h -lock.o: lock.c +lock.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +lock.o: include/internal/cryptlib.h lock.c mem.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h mem.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h mem.o: ../include/openssl/err.h ../include/openssl/lhash.h mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h mem.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -mem.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h -mem.o: mem.c +mem.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +mem.o: include/internal/cryptlib.h mem.c mem_clr.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h mem_clr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h mem_clr.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h @@ -200,36 +185,40 @@ mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h mem_dbg.o: ../include/openssl/err.h ../include/openssl/lhash.h mem_dbg.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h mem_dbg.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h -mem_dbg.o: mem_dbg.c -o_dir.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h -o_dir.o: LPdir_unix.c o_dir.c o_dir.h +mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +mem_dbg.o: include/internal/cryptlib.h mem_dbg.c +o_dir.o: ../e_os.h ../include/internal/o_dir.h ../include/openssl/e_os2.h +o_dir.o: ../include/openssl/opensslconf.h LPdir_unix.c o_dir.c o_fips.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h o_fips.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h o_fips.o: ../include/openssl/err.h ../include/openssl/lhash.h o_fips.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h o_fips.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -o_fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h -o_fips.o: o_fips.c +o_fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +o_fips.o: include/internal/cryptlib.h o_fips.c o_init.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/crypto.h o_init.o: ../include/openssl/e_os2.h ../include/openssl/err.h o_init.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h o_init.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h o_init.o: ../include/openssl/safestack.h ../include/openssl/stack.h o_init.o: ../include/openssl/symhacks.h o_init.c -o_str.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h -o_str.o: o_str.c o_str.h +o_str.o: ../e_os.h ../include/internal/o_str.h ../include/openssl/e_os2.h +o_str.o: ../include/openssl/opensslconf.h o_str.c o_time.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h o_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h o_time.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h o_time.o: ../include/openssl/stack.h ../include/openssl/symhacks.h o_time.c +sec_mem.o: ../e_os.h ../include/openssl/crypto.h ../include/openssl/e_os2.h +sec_mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +sec_mem.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h +sec_mem.o: ../include/openssl/stack.h ../include/openssl/symhacks.h sec_mem.c thr_id.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h thr_id.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h thr_id.o: ../include/openssl/err.h ../include/openssl/lhash.h thr_id.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h thr_id.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -thr_id.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h -thr_id.o: thr_id.c +thr_id.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +thr_id.o: include/internal/cryptlib.h thr_id.c uid.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h uid.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h uid.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h