Update from stable branch.

[oweals/openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index 68a9dbd4833fed2d522e9605537e05d845d041a7..1322b72a39b365f5212e833e48e20e24cddc7f0d 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -52,6 +52,30 @@ top:
 
 all: shared
 
+BUILDENV=      PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
+               CC='${CC}' CFLAG='${CFLAG}'                     \
+               AS='${CC}' ASFLAG='${CFLAG} -c'                 \
+               AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'    \
+               SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib'           \
+               INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'   \
+               MAKEDEPEND='$$(TOP)/util/domd $$(TOP) -MD $(MAKEDEPPROG)'\
+               DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'    \
+               MAKEDEPPROG='${MAKEDEPPROG}'                    \
+               LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
+               KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'   \
+               EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'       \
+               SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' \
+               PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'     \
+               CPUID_OBJ='${CPUID_OBJ}'                        \
+               BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}'         \
+               AES_ASM_OBJ='${AES_ASM_OBJ}'                    \
+               BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}'       \
+               RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}'       \
+               SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'                  \
+               MD5_ASM_OBJ='${MD5_ASM_OBJ}'                    \
+               RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'              \
+               THIS=$${THIS:-$@}
+
 buildinf.h: ../Makefile
        ( echo "#ifndef MK1MF_BUILD"; \
        echo '  /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \
@@ -67,6 +91,12 @@ x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
 x86cpuid-out.s: x86cpuid.pl perlasm/x86asm.pl
        $(PERL) x86cpuid.pl a.out $(CFLAGS) $(PROCESSOR) > $@
 
+uplink.o:      ../ms/uplink.c
+       $(CC) $(CFLAGS) -c -o $@ ../ms/uplink.c
+
+uplink-cof.s:  ../ms/uplink.pl
+       $(PERL) ../ms/uplink.pl coff > $@
+
 x86_64cpuid.s: x86_64cpuid.pl
        $(PERL) x86_64cpuid.pl $@
 ia64cpuid.s: ia64cpuid.S
@@ -82,7 +112,7 @@ subdirs:
        @for i in $(SDIRS) ;\
        do \
        (cd $$i && echo "making all in crypto/$$i..." && \
-       $(MAKE) INCLUDES='${INCLUDES}' all ) || exit 1; \
+       $(MAKE) $(BUILDENV) INCLUDES='${INCLUDES}' all ) || exit 1; \
        done;
 
 files:
@@ -151,11 +181,12 @@ 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)" ] || for i in $(SDIRS) ;\
-       do \
-       (cd $$i && echo "making depend in crypto/$$i..." && \
-       $(MAKE) INCLUDES='${INCLUDES}' depend ); \
-       done;
+       @[ -z "$(THIS)" ] || (set -e; \
+       for i in $(SDIRS) ; do \
+           (   cd $$i && echo "making depend in crypto/$$i..." && \
+               $(MAKE) INCLUDES='${INCLUDES}' depend \
+           ); \
+       done; )
        @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 
 clean: