copyright

[openssl.git] / crypto / Makefile.ssl

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 0097bdd28fd4c3781396e3a0b6eb6addca62341c..3e3f5ebaab13b9920483c0f3969e3f253b197a2a 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -28,20 +28,21 @@ LIBS=
 
 SDIRS= md2 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
-       bn rsa dsa dh dso engine rijndael \
+       bn ec rsa dsa dh dso engine rijndael \
        buffer bio stack lhash rand err objects \
-       evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp
+       evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui
 
 GENERAL=Makefile README crypto-lib.com install.com
 
 LIB= $(TOP)/libcrypto.a
-LIBSRC=        cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c
-LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o
+LIBSRC=        cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c
+LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h
-HEADER=        cryptlib.h buildinf.h md32_common.h $(EXHEADER)
+EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h \
+       types.h
+HEADER=        cryptlib.h buildinf.h md32_common.h o_time.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -74,7 +75,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making 'files' in crypto/$$i..."; \
+       (cd $$i && echo "making 'files' in crypto/$$i..." && \
        $(MAKE) PERL='${PERL}' files ); \
        done;
 
@@ -85,27 +86,26 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
        @$(TOP)/util/point.sh Makefile.ssl Makefile
        @for i in $(SDIRS); do \
-       (cd $$i; echo "making links in crypto/$$i..."; \
+       (cd $$i && echo "making links in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \
        done;
 
 lib:   $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)
-       @echo You may get an error following this line.  Please ignore.
-       - $(RANLIB) $(LIB)
+       $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 
 libs:
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making libs in crypto/$$i..."; \
+       (cd $$i && echo "making libs in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \
        done;
 
 tests:
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making tests in crypto/$$i..."; \
+       (cd $$i && echo "making tests in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \
        done;
 
@@ -117,14 +117,14 @@ install:
        done;
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making install in crypto/$$i..."; \
+       (cd $$i && echo "making install in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}'  INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \
        done;
 
 lint:
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making lint in crypto/$$i..."; \
+       (cd $$i && echo "making lint in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \
        done;
 
@@ -134,7 +134,7 @@ depend:
        if [ ! -s buildinf.h ]; then rm buildinf.h; fi
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making depend in crypto/$$i..."; \
+       (cd $$i && echo "making depend in crypto/$$i..." && \
        $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' depend ); \
        done;
 
@@ -142,7 +142,7 @@ clean:
        rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making clean in crypto/$$i..."; \
+       (cd $$i && echo "making clean in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' clean ); \
        done;
 
@@ -151,7 +151,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making dclean in crypto/$$i..."; \
+       (cd $$i && echo "making dclean in crypto/$$i..." && \
        $(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
        done;
 
@@ -193,6 +193,8 @@ 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/safestack.h ../include/openssl/stack.h
 mem_dbg.o: ../include/openssl/symhacks.h cryptlib.h mem_dbg.c
+o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_time.c
+o_time.o: o_time.h
 tmdiff.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
 tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 tmdiff.o: ../include/openssl/err.h ../include/openssl/lhash.h