Only free if it ain't NULL.

[openssl.git] / crypto / Makefile.ssl

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index efdbba38acaa2644fb3657cb5d97955aeebec288..3303523e08451035e43fdc464137a16ef6d1dc61 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -22,7 +22,7 @@ MAKEFILE=     Makefile.ssl
 PEX_LIBS=
 EX_LIBS=
  
 PEX_LIBS=
 EX_LIBS=
  

-CFLAGS= $(INCLUDE) $(CFLAG) -DCFLAGS=" \"$(CC) $(CFLAG)\" "
+CFLAGS= $(INCLUDE) $(CFLAG) -DCFLAGS=" \"$(CC) $(CFLAG)\" " -DPLATFORM=" \"$(PLATFORM)\" "

 
 ERR=crypto
 ERRC=cpt_err
 
 ERR=crypto
 ERRC=cpt_err


@@ -34,17 +34,17 @@ SDIRS=      md2 md5 sha mdc2 hmac ripemd \
        bn rsa dsa dh \
        buffer bio stack lhash rand err objects \
        evp pem x509 \
        bn rsa dsa dh \
        buffer bio stack lhash rand err objects \
        evp pem x509 \

-       asn1 conf txt_db pkcs7
+       asn1 conf txt_db pkcs7 comp

 
 GENERAL=Makefile README
 
 LIB= $(TOP)/libcrypto.a
 
 GENERAL=Makefile README
 
 LIB= $(TOP)/libcrypto.a

-LIBSRC=        cryptlib.c mem.c cversion.c ex_data.c $(ERRC).c
-LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o $(ERRC).o
+LIBSRC=        cryptlib.c mem.c cversion.c ex_data.c tmdiff.c $(ERRC).c
+LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o $(ERRC).o

 
 SRC= $(LIBSRC)
 
 
 SRC= $(LIBSRC)
 

-EXHEADER= crypto.h cryptall.h
+EXHEADER= crypto.h cryptall.h tmdiff.h

 HEADER=        cryptlib.h date.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 HEADER=        cryptlib.h date.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)


@@ -54,14 +54,14 @@ top:
 
 all: date.h lib subdirs
 
 
 all: date.h lib subdirs
 

-date.h: ../Makefile.ssl ../VERSION
+date.h: ../Makefile.ssl

        echo "#define DATE      \"`date`\"" >date.h
 
 subdirs:
        @for i in $(SDIRS) ;\
        do \
        echo "#define DATE      \"`date`\"" >date.h
 
 subdirs:
        @for i in $(SDIRS) ;\
        do \

-       (cd $$i; echo "making all in $$i..."; \
-       $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_MULW='${BN_MULW}' 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}' all ); \
+       (cd $$i && echo "making all in $$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}' all ) || exit 1; \

        done;
 
 files:
        done;
 
 files:


@@ -74,11 +74,11 @@ files:
 
 links:
        /bin/rm -f Makefile 
 
 links:
        /bin/rm -f Makefile 

-       $(TOP)/util/point.sh Makefile.ssl Makefile ;
-       $(TOP)/util/mklink.sh ../include $(HEADER) ;
-       $(TOP)/util/mklink.sh ../test $(TEST) ;
-       $(TOP)/util/mklink.sh ../apps $(APPS) ;
-       $(TOP)/util/point.sh Makefile.ssl Makefile;
+       $(TOP)/util/point.sh Makefile.ssl Makefile
+       $(TOP)/util/mklink.sh ../include $(HEADER)
+       $(TOP)/util/mklink.sh ../test $(TEST)
+       $(TOP)/util/mklink.sh ../apps $(APPS)
+       $(TOP)/util/point.sh Makefile.ssl Makefile

        @for i in $(SDIRS) ;\
        do \
        (cd $$i; echo "making links in $$i..."; \
        @for i in $(SDIRS) ;\
        do \
        (cd $$i; echo "making links in $$i..."; \