generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefiles updated to exit if an error occurs in a sub-directory make

Browse Source 
(including if user presses ^C)
This commit is contained in:
Paul C. Sutton
1999-01-01 12:51:11 +00:00
parent 8f3e97bac3
commit 56ee3117a5
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -5,6 +5,9 @@
Changes between 0.9.1c and 0.9.2 Changes between 0.9.1c and 0.9.2
*) Makefiles updated to exit if an error occurs in a sub-directory
make (including if user presses ^C) [Paul Sutton]
*) Make Montgomery context stuff explicit in RSA data structure. *) Make Montgomery context stuff explicit in RSA data structure.
[Ben Laurie] [Ben Laurie]

42
Makefile.org
View File

@@ -187,15 +187,15 @@ HEADER= e_os.h
all: all:
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
(cd $$i; echo "making $$i..."; \ (cd $$i && echo "making $$i..." && \
$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 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}' SDIRS='${SDIRS}' AR='${AR}' all ); \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 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}' SDIRS='${SDIRS}' AR='${AR}' all ) || exit 1; \
done; done;
sub_all: sub_all:
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
(cd $$i; echo "making $$i..."; \ (cd $$i && echo "making $$i..." && \
$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 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}' AR='${AR}' all ); \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 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}' AR='${AR}' all ) || exit 1; \
done; done;
libclean: libclean:
@@ -205,8 +205,8 @@ clean:
/bin/rm -f shlib/*.o *.o core a.out fluff *.map /bin/rm -f shlib/*.o *.o core a.out fluff *.map
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
(cd $$i; echo "cleaning $$i..."; \ (cd $$i && echo "cleaning $$i..." && \
$(MAKE) SDIRS='${SDIRS}' clean ); \ $(MAKE) SDIRS='${SDIRS}' clean ) || exit 1; \
/bin/rm -f $(LIBS); \ /bin/rm -f $(LIBS); \
done; done;
/bin/rm -f *.a *.o speed.* *.map *.so .pure core /bin/rm -f *.a *.o speed.* *.map *.so .pure core
@@ -224,8 +224,8 @@ files: MINFO
perl $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO perl $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
(cd $$i; echo "making 'files' in $$i..."; \ (cd $$i && echo "making 'files' in $$i..." && \
$(MAKE) SDIRS='${SDIRS}' files ); \ $(MAKE) SDIRS='${SDIRS}' files ) || exit 1; \
done; done;
links: links:
@@ -234,8 +234,8 @@ links:
$(TOP)/util/mklink.sh include $(EXHEADER) $(TOP)/util/mklink.sh include $(EXHEADER)
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
(cd $$i; echo "making links in $$i..."; \ (cd $$i && echo "making links in $$i..." && \
$(MAKE) SDIRS='${SDIRS}' links ); \ $(MAKE) SDIRS='${SDIRS}' links ) || exit 1; \
done; done;
@(SSLEAY="`pwd`/apps/ssleay"; export SSLEAY; sh tools/c_rehash certs) @(SSLEAY="`pwd`/apps/ssleay"; export SSLEAY; sh tools/c_rehash certs)
@@ -243,8 +243,8 @@ dclean:
/bin/rm -f *.bak /bin/rm -f *.bak
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
(cd $$i; echo "undoing makedepend in $$i..."; \ (cd $$i && echo "undoing makedepend in $$i..." && \
$(MAKE) SDIRS='${SDIRS}' dclean ); \ $(MAKE) SDIRS='${SDIRS}' dclean ) || exit 1; \
done; done;
rehash: rehash:
@@ -253,36 +253,36 @@ rehash:
test: tests test: tests
tests: tests:
(cd test; echo "testing $$i..."; \ (cd test && echo "testing $$i..." && \
$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' tests ); $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' tests );
@apps/ssleay version -a @apps/ssleay version -a
depend: depend:
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
(cd $$i; echo "making dependancies $$i..."; \ (cd $$i && echo "making dependancies $$i..." && \
$(MAKE) SDIRS='${SDIRS}' depend ); \ $(MAKE) SDIRS='${SDIRS}' depend ) || exit 1; \
done; done;
lint: lint:
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
(cd $$i; echo "making lint $$i..."; \ (cd $$i && echo "making lint $$i..." && \
$(MAKE) SDIRS='${SDIRS}' lint ); \ $(MAKE) SDIRS='${SDIRS}' lint ) || exit 1; \
done; done;
tags: tags:
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
(cd $$i; echo "making tags $$i..."; \ (cd $$i && echo "making tags $$i..." && \
$(MAKE) SDIRS='${SDIRS}' tags ); \ $(MAKE) SDIRS='${SDIRS}' tags ) || exit 1; \
done; done;
errors: errors:
@for i in $(DIRS) ;\ @for i in $(DIRS) ;\
do \ do \
(cd $$i; echo "making errors in $$i..."; \ (cd $$i && echo "making errors in $$i..." && \
$(MAKE) SDIRS='${SDIRS}' errors ); \ $(MAKE) SDIRS='${SDIRS}' errors ) || exit 1; \
done; done;
tar: tar:

4
crypto/Makefile.ssl
View File

@@ -60,8 +60,8 @@ date.h: ../Makefile.ssl
subdirs: subdirs:
@for i in $(SDIRS) ;\ @for i in $(SDIRS) ;\
do \ do \
(cd $$i; echo "making all in $$i..."; \ (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 ); \ $(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; done;
files: files: