diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-01-25 22:09:11 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-01-25 22:09:11 +0000 |
| commit | fbdce13e5a068f43dacb19aa569ff7cebe8e3c9d (patch) | |
| tree | e1ac970a99d07451740c8c36b2b41a3c8fdf82cb | |
| parent | e532a6c449049f4cfe611d3b5aa039d47a5d0018 (diff) | |
| download | openssl-new-fbdce13e5a068f43dacb19aa569ff7cebe8e3c9d.tar.gz | |
Please BSD make...
| -rw-r--r-- | Makefile.org | 2 | ||||
| -rw-r--r-- | apps/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/aes/Makefile.ssl | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.org b/Makefile.org index 826dc086cc..f469867d3f 100644 --- a/Makefile.org +++ b/Makefile.org @@ -244,7 +244,7 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ BUILD_CMD=if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \ if [ -d "$$dir" ]; then \ (cd $$dir && echo "making $$target in $$dir..." && \ - $(MAKE) $(BUILDENV) $$target ) || exit 1; \ + $(MAKE) -e $(BUILDENV) $$target ) || exit 1; \ else \ $(MAKE) $$dir; \ fi; fi diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl index 843fe1e615..1f75cb50f4 100644 --- a/apps/Makefile.ssl +++ b/apps/Makefile.ssl @@ -165,7 +165,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(EXE) CC="$(CC)" LDFLAGS="$(LDFLAG)" \ + APPNAME=$(EXE) CC="$(CC)" LDFLAGS="$(CFLAG)" \ SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(PROGRAM).o $(E_OBJ)" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index b22e08e9e2..bb9df4a642 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -85,7 +85,7 @@ subdirs: @for i in $(SDIRS) ;\ do \ (cd $$i && echo "making all in crypto/$$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}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ + $(MAKE) -e INCLUDES='${INCLUDES}' all ) || exit 1; \ done; files: diff --git a/crypto/aes/Makefile.ssl b/crypto/aes/Makefile.ssl index 83950fac01..10b99712d6 100644 --- a/crypto/aes/Makefile.ssl +++ b/crypto/aes/Makefile.ssl @@ -21,6 +21,7 @@ AES_ASM_OBJ=aes_core.o aes_cbc.o CFLAGS= $(INCLUDES) $(CFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) +AFLAGS= $(ASFLAGS) GENERAL=Makefile #TEST=aestest.c |