We have some source with \r\n as line ends. DEC C informs about that,

[oweals/openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index 68a9dbd4833fed2d522e9605537e05d845d041a7..ee6e507dc7467763c848154e73f62d0aaa590429 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -67,6 +67,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 +88,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 +157,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: