Add constant_time_locl.h to HEADERS,

[openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index 1de9d5f4b94f75b273113d178247a1c88508f985..526628a408925c2ac2cd14efaefac651cf6c4876 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -31,6 +31,7 @@ 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)
@@ -45,7 +46,8 @@ 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_time.h o_str.h o_dir.h $(EXHEADER)
+HEADER=        cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h \
+       constant_time_locl.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -86,7 +88,9 @@ ia64cpuid.s:  ia64cpuid.S;    $(CC) $(CFLAGS) -E ia64cpuid.S > $@
 ppccpuid.s:    ppccpuid.pl;    $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
 pariscid.s:    pariscid.pl;    $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
 alphacpuid.s:  alphacpuid.pl
-       $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
+       (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \
+       $(PERL) alphacpuid.pl > $$preproc && \
+       $(CC) -E -P $$preproc > $@ && rm $$preproc)
 
 subdirs:
        @target=all; $(RECURSIVE_MAKE)
@@ -218,8 +222,10 @@ 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_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_time.c
-o_time.o: o_time.h
+o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
+o_time.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+o_time.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+o_time.o: ../include/openssl/symhacks.h crypto.h o_time.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