Reformat the CFLAG string so it can be made part of a C string.

[openssl.git] / crypto / Makefile.ssl

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 3533ad8d3dcef5298d5397c696e8b29f7505213f..98685800e4a8451806a025c580ab8514d4c652d5 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -28,35 +28,37 @@ LIBS=
 
 SDIRS= md2 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
-       bn ec rsa dsa dh dso engine rijndael \
+       bn ec rsa dsa ecdsa dh dso engine aes \
        buffer bio stack lhash rand err objects \
-       evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui
+       evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5
 
 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
+SHARED_LIB= libcrypto$(SHLIB_EXT)
+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 \
+       ossl_typ.h
+HEADER=        cryptlib.h buildinf.h md32_common.h o_time.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
 top:
        @(cd ..; $(MAKE) DIRS=$(DIR) all)
 
-all: buildinf.h lib subdirs
+all: buildinf.h lib subdirs shared
 
 buildinf.h: ../Makefile.ssl
        ( echo "#ifndef MK1MF_BUILD"; \
-       echo "  /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
-       echo "  #define CFLAGS \"$(CC) $(CFLAG)\""; \
-       echo "  #define PLATFORM \"$(PLATFORM)\""; \
-       echo "  #define DATE \"`date`\""; \
-       echo "#endif" ) >buildinf.h
+       echo '  /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */'; \
+       echo '  #define CFLAGS "$(CC) $(CFLAG)"'; \
+       echo '  #define PLATFORM "$(PLATFORM)"'; \
+       echo "  #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
+       echo '#endif' ) >buildinf.h
 
 testapps:
        if echo ${SDIRS} | fgrep ' des '; \
@@ -94,6 +96,11 @@ lib: $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 
+shared:
+       if [ -n "$(SHARED_LIBS)" ]; then \
+               (cd ..; make $(SHARED_LIB)); \
+       fi
+
 libs:
        @for i in $(SDIRS) ;\
        do \
@@ -192,6 +199,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