Get rid of a nasty debugging message which was forgotten here...

[openssl.git] / crypto / Makefile.ssl

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index ab821e2ccb7d8fedff57a491bc9d8f8d8a490da9..17922ff1174530f3488fd8ba4ac8581ae67c3b05 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -10,15 +10,11 @@ INCLUDES=   -I.. -I../../include
 CFLAG=         -g
 INSTALLTOP=    /usr/local/ssl
 MAKE=           make -f Makefile.ssl
-MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEDEPEND=    $(TOP)/util/domd $(TOP)
 MAKEFILE=       Makefile.ssl
 RM=             /bin/rm -f
 AR=            ar r
 
-MAKE=          make -f Makefile.ssl
-MAKEDEPEND=    makedepend -f Makefile.ssl
-MAKEFILE=      Makefile.ssl
-
 PEX_LIBS=
 EX_LIBS=
  
@@ -33,8 +29,7 @@ SDIRS=        md2 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
        bn rsa dsa dh \
        buffer bio stack lhash rand err objects \
-       evp pem x509 \
-       asn1 conf txt_db pkcs7 comp
+       evp asn1 pem x509 x509v3 conf txt_db pkcs7 comp
 
 GENERAL=Makefile README
 
@@ -54,14 +49,14 @@ top:
 
 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 \
-       (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 ); \
+       (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:
@@ -74,11 +69,11 @@ files:
 
 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..."; \
@@ -128,7 +123,7 @@ depend:
        @for i in $(SDIRS) ;\
        do \
        (cd $$i; echo "making depend in $$i..."; \
-       $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' MAKEDEPEND='${MAKEDEPEND}' depend ); \
+       $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' depend ); \
        done;
 
 clean:
@@ -148,14 +143,32 @@ dclean:
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
        done;
 
-errors:
-       perl ./err/err_code.pl -conf err/ssleay.ec *.c */*.c ../ssl/*.c ../rsaref/*.c
+errors: errgen $(ERRC).c
+
+$(ERRC).c: $(ERR).err
        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
        perl err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+errgen:
+       perl ./err/err_code.pl -conf err/ssleay.ec *.c */*.c ../ssl/*.c ../rsaref/*.c
        @for i in $(SDIRS) ;\
        do \
        (cd $$i; echo "making errors in $$i..."; \
        $(MAKE) errors ); \
        done;
 
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.
+
+cpt_err.o: ../include/err.h ../include/stack.h crypto.h
+cryptlib.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
+cryptlib.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h
+cversion.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
+cversion.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h
+ex_data.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
+ex_data.o: ../include/err.h ../include/lhash.h ../include/stack.h cryptlib.h
+ex_data.o: crypto.h
+mem.o: ../include/bio.h ../include/buffer.h ../include/e_os.h ../include/err.h
+mem.o: ../include/lhash.h ../include/stack.h cryptlib.h crypto.h
+tmdiff.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
+tmdiff.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h tmdiff.h