Sort CFLAGS, SRC and SSLASM stanzas by the directories they apply to, to make

these files similar in layout to the other md Makefile.inc; no functional
change.

1 files changed, 36 insertions, 31 deletions

diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index 13f20d249d..a4b8c46ef3 100644
--- a/src/lib/libcrypto/arch/i386/Makefile.inc
+++ b/src/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,45 +1,49 @@
-# $OpenBSD: Makefile.inc,v 1.1 2014/04/17 18:11:47 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2014/05/06 19:55:06 miod Exp $
 
 # i386-specific libcrypto build rules
 
-SRCS+= wp_block.c
+# aes
+CFLAGS+= -DAES_ASM
+SSLASM+= aes aes-586
+CFLAGS+= -DVPAES_ASM
+SSLASM+= aes vpaes-x86
+SSLASM+= aes aesni-x86
+# bf
 SRCS+= bf_cbc.c 
-
-CFLAGS+= -DOPENSSL_BN_ASM_GF2m
-CFLAGS+= -DOPENSSL_BN_ASM_MONT
-CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
-CFLAGS+= -DOPENSSL_CPUID_OBJ
+SSLASM+= bf bf-586
+# bn
 CFLAGS+= -DOPENSSL_IA32_SSE2
-
-CFLAGS+= -DAES_ASM
-CFLAGS+= -DGHASH_ASM
+CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
+SSLASM+= bn bn-586
+SSLASM+= bn co-586
+CFLAGS+= -DOPENSSL_BN_ASM_MONT
+SSLASM+= bn x86-mont
+CFLAGS+= -DOPENSSL_BN_ASM_GF2m
+SSLASM+= bn x86-gf2m
+# des
+SSLASM+= des des-586
+# md5
 CFLAGS+= -DMD5_ASM
+SSLASM+= md5 md5-586
+# modes
+CFLAGS+= -DGHASH_ASM
+SSLASM+= modes ghash-x86
+# rc4
+SSLASM+= rc4 rc4-586
+# ripemd
 CFLAGS+= -DRMD160_ASM
+SSLASM+= ripemd rmd-586
+# sha
 CFLAGS+= -DSHA1_ASM
+SSLASM+= sha sha1-586
 CFLAGS+= -DSHA256_ASM
+SSLASM+= sha sha256-586
 CFLAGS+= -DSHA512_ASM
-CFLAGS+= -DVPAES_ASM
+SSLASM+= sha sha512-586
+# whrlpool
+SRCS+= wp_block.c
 CFLAGS+= -DWHIRLPOOL_ASM
-
-SSLASM=\
-        aes aes-586 \
-        aes vpaes-x86 \
-        aes aesni-x86 \
-        bf bf-586 \
-        bn bn-586 \
-        bn co-586 \
-        bn x86-mont \
-        bn x86-gf2m \
-        des crypt586 \
-        des des-586 \
-        md5 md5-586 \
-        modes ghash-x86 \
-        rc4 rc4-586 \
-        ripemd rmd-586 \
-        sha sha1-586 \
-        sha sha256-586 \
-        sha sha512-586 \
-        whrlpool wp-mmx
+SSLASM+= whrlpool wp-mmx
 
 .for dir f in ${SSLASM}
 SRCS+=  ${f}.S
@@ -50,6 +54,7 @@ ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl
                     openbsd-elf ${CFLAGS} 386 ${PICFLAG} > ${.TARGET}
 .endfor
 
+CFLAGS+= -DOPENSSL_CPUID_OBJ
 SRCS+=  x86cpuid.S
 GENERATED+=x86cpuid.S