Commit 01fc834b authored by Richard Levitte's avatar Richard Levitte
Browse files

Have ASFLAGS be defined the same way as CFLAGS

parent f7f8d82a

Makefile.org

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ MAKEDEPPROG=makedepend 
# gcc, then the driver will automatically translate it to -xarch=v8plus

# and pass it down to assembler.

AS=$(CC) -c

ASFLAGS=$(CFLAG)

ASFLAG=$(CFLAG)



# Set BN_ASM to bn_asm.o if you want to use the C version

BN_ASM= bn_asm.o
@@ -219,7 +219,7 @@ all: Makefile.ssl build_all openssl.pc 
BUILD_CMD=if echo " $(DIRS) " | grep " $$i " >/dev/null 2>/dev/null; then \

	if [ -d "$$i" ]; then \

		(cd $$i && echo "making all in $$i..." && \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAGS='${ASFLAGS}' 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}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' 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}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \

	else \

		$(MAKE) $$i; \

	fi; fi

crypto/bn/Makefile.ssl

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ BN_ASM= bn_asm.o 
#BN_ASM=	bn86-elf.o



CFLAGS= $(INCLUDES) $(CFLAG)

ASFLAGS= $(INCLUDES) $(ASFLAG)



GENERAL=Makefile

TEST=bntest.c exptest.c

crypto/md5/Makefile.ssl

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ DIR= md5 
TOP=    ../..

CC=     cc

CPP=    $(CC) -E

INCLUDES=

INCLUDES=-I.. -I$(TOP) -I../../include

CFLAG=-g

INSTALL_PREFIX=

OPENSSLDIR=     /usr/local/ssl
@@ -20,6 +20,7 @@ AR= ar r 
MD5_ASM_OBJ=



CFLAGS= $(INCLUDES) $(CFLAG)

ASFLAGS= $(INCLUDES) $(ASFLAG)



GENERAL=Makefile

TEST=md5test.c