Make it possible to link VC static lib with either /MT or /MD application

[oweals/openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index c6c76c26ac3553610a5950766a51f714ff15a267..bb8eaa036c55c9e5ade13b6ca9e43fe8e94edb86 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -1,5 +1,5 @@
 #
-# SSLeay/crypto/Makefile
+# OpenSSL/crypto/Makefile
 #
 
 DIR=           crypto
@@ -15,6 +15,11 @@ MAKEFILE=       Makefile
 RM=             rm -f
 AR=            ar r
 
+RECURSIVE_MAKE=        [ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \
+                   (cd $$i && echo "making $$target in $(DIR)/$$i..." && \
+                   $(MAKE) -e TOP=../.. DIR=$$i INCLUDES='${INCLUDES}' $$target ) || exit 1; \
+               done;
+
 PEX_LIBS=
 EX_LIBS=
  
@@ -24,14 +29,6 @@ AFLAGS=$(ASFLAGS)
 
 LIBS=
 
-SDIRS= objects \
-       md2 md4 md5 sha mdc2 hmac ripemd \
-       des rc2 rc4 rc5 idea bf cast \
-       bn ec rsa dsa ecdsa ecdh dh dso engine aes \
-       buffer bio stack lhash rand err \
-       evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
-       store pqueue
-
 GENERAL=Makefile README crypto-lib.com install.com
 
 LIB= $(TOP)/libcrypto.a
@@ -79,39 +76,30 @@ ia64cpuid.s: ia64cpuid.S
        $(CC) $(CFLAGS) -E ia64cpuid.S > $@
 
 testapps:
-       [ -z "$(THIS)" ] || ( if echo ${SDIRS} | fgrep ' des '; \
-       then cd des && $(MAKE) des; fi )
-       [ -z "$(THIS)" ] || ( cd pkcs7 && $(MAKE) testapps );
+       [ -z "$(THIS)" ] || (   if echo ${SDIRS} | fgrep ' des '; \
+                               then cd des && $(MAKE) -e des; fi )
+       [ -z "$(THIS)" ] || ( cd pkcs7 && $(MAKE) -e testapps );
        @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 
 subdirs:
-       @for i in $(SDIRS) ;\
-       do \
-       (cd $$i && echo "making all in crypto/$$i..." && \
-       $(MAKE) INCLUDES='${INCLUDES}' all ) || exit 1; \
-       done;
+       @target=all; $(RECURSIVE_MAKE)
 
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-       @for i in $(SDIRS) ;\
-       do \
-       (cd $$i && echo "making 'files' in crypto/$$i..." && \
-       $(MAKE) files ); \
-       done;
+       @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)
-       @for i in $(SDIRS); do \
-           (cd $$i && echo "making links in crypto/$$i..." && \
-           $(MAKE) links ); \
-       done;
+       @target=links; $(RECURSIVE_MAKE)
 
-lib:   $(LIBOBJ)
+# lib: and $(LIB): are splitted to avoid end-less loop
+lib:   $(LIB)
+       @touch lib
+$(LIB):        $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
-       @touch lib
 
 shared: buildinf.h lib subdirs
        if [ -n "$(SHARED_LIBS)" ]; then \
@@ -119,19 +107,7 @@ shared: buildinf.h lib subdirs
        fi
 
 libs:
-       @for i in $(SDIRS) ;\
-       do \
-       (cd $$i && echo "making libs in crypto/$$i..." && \
-       $(MAKE) lib );
-       done;
-
-tests:
-       @[ -z "$(THIS)" ] || (for i in $(SDIRS) ;\
-       do \
-       (cd $$i && echo "making tests in crypto/$$i..." && \
-       $(MAKE) tests ); \
-       done; )
-       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+       @target=lib; $(RECURSIVE_MAKE)
 
 install:
        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
@@ -140,47 +116,26 @@ install:
        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
        done;
-       @for i in $(SDIRS) ;\
-       do \
-       (cd $$i && echo "making install in crypto/$$i..." && \
-       $(MAKE) install ); \
-       done;
+       @target=install; $(RECURSIVE_MAKE)
 
 lint:
-       @for i in $(SDIRS) ;\
-       do \
-       (cd $$i && echo "making lint in crypto/$$i..." && \
-       $(MAKE) lint ); \
-       done;
+       @target=lint; $(RECURSIVE_MAKE)
 
 depend:
-       [ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake buildinf.h if it does not exist
-       [ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
-       [ -z "$(THIS)" -o -s buildinf.h ] || rm buildinf.h
-       @[ -z "$(THIS)" ] || (set -e; \
-       for i in $(SDIRS) ; do \
-           (   cd $$i && echo "making depend in crypto/$$i..." && \
-               $(MAKE) INCLUDES='${INCLUDES}' depend \
-           ); \
-       done; )
+       @[ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake buildinf.h if it does not exist
+       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       @[ -z "$(THIS)" -o -s buildinf.h ] || rm buildinf.h
+       @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
        @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 
 clean:
        rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-       @for i in $(SDIRS) ;\
-       do \
-       (cd $$i && echo "making clean in crypto/$$i..." && \
-       $(MAKE) clean ); \
-       done;
+       @target=clean; $(RECURSIVE_MAKE)
 
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)
-       @for i in $(SDIRS) ;\
-       do \
-       (cd $$i && echo "making dclean in crypto/$$i..." && \
-       $(MAKE) dclean ); \
-       done;
+       @target=dclean; $(RECURSIVE_MAKE)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.