Identify and move common internal libcrypto header files

[thirdparty/openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index 10782404dad5b6ab4273774ab7c8b84464bccfcf..caffc77b4a17245292ea22ab866c2bcf753e24d0 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -7,7 +7,7 @@ TOP=            ..
 CC=            cc
 INCLUDE=       -I. -I$(TOP) -I../include $(ZLIB_INCLUDE)
 # INCLUDES targets sudbirs!
-INCLUDES=      -I.. -I../.. -I../modes -I../asn1 -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,7 +31,6 @@ 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)
@@ -44,12 +43,9 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \
 
 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)
@@ -86,6 +82,8 @@ alphacpuid.s: alphacpuid.pl
        (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \
        $(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)
@@ -94,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
@@ -115,17 +107,6 @@ 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)
 
@@ -201,8 +182,8 @@ 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
+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
@@ -216,8 +197,8 @@ 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