diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/lib/md5/make | 26 | ||||
| -rw-r--r-- | auto/lib/md5/makefile.msvc | 14 | ||||
| -rw-r--r-- | auto/lib/md5/makefile.owc | 2 |
3 files changed, 31 insertions, 11 deletions
diff --git a/auto/lib/md5/make b/auto/lib/md5/make index d75a301e2..1cca3add7 100644 --- a/auto/lib/md5/make +++ b/auto/lib/md5/make @@ -31,24 +31,34 @@ case $PLATFORM in cp auto/lib/md5/$makefile $MD5 echo " cd $MD5" >> $MAKEFILE - echo " \$(MAKE) -f $makefile LIB_OPT=$LIB_OPT" >> $MAKEFILE + echo $ngx_n " \$(MAKE) -f $makefile" $ngx_c >> $MAKEFILE + echo " CPU_OPT=$CPU_OPT MD5_ASM=$MD5_ASM" >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE ;; SunOS:*:i86pc) - echo " cd $MD5 && \$(MAKE) x86-solaris" >> $MAKEFILE + if [ $MD5_ASM = YES ]; then + echo " cd $MD5 && \$(MAKE) $MD5_OPT x86-solaris" >> $MAKEFILE + else + echo " cd $MD5 \\" >> $MAKEFILE + echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE + echo " MD5_ASM_OBJ= CC=$CC all" >> $MAKEFILE + fi ;; *:i386) - echo " cd $MD5 && \$(MAKE) x86-elf" >> $MAKEFILE + if [ $MD5_ASM = YES ]; then + echo " cd $MD5 && \$(MAKE) $MD5_OPT x86-elf" >> $MAKEFILE + else + echo " cd $MD5 \\" >> $MAKEFILE + echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE + echo " MD5_ASM_OBJ= CC=$CC all" >> $MAKEFILE + fi ;; *) - if [ $CC = gcc ]; then - echo " cd $MD5 && \$(MAKE) gcc" >> $MAKEFILE - else - echo " cd $MD5 && \$(MAKE) cc" >> $MAKEFILE - fi + echo " cd $MD5 \\" >> $MAKEFILE + echo " && \$(MAKE) $MD5_OPT MD5_ASM_OBJ= CC=$CC all" >> $MAKEFILE ;; esac diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc index ad719c050..65ca4ab8d 100644 --- a/auto/lib/md5/makefile.msvc +++ b/auto/lib/md5/makefile.msvc @@ -1,6 +1,16 @@ -CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(LIB_OPT) -D MD5_ASM -D L_ENDIAN +CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(CPU_OPT) -D L_ENDIAN + +!if "$(MD5_ASM)" == "YES" md5.lib: - cl $(CFLAGS) md5_dgst.c + cl $(CFLAGS) -D MD5_ASM md5_dgst.c link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj + +!else + +md5.lib: + cl $(CFLAGS) md5_dgst.c + link -lib -out:md5.lib md5_dgst.obj + +!endif diff --git a/auto/lib/md5/makefile.owc b/auto/lib/md5/makefile.owc index f02a742ec..2cb6b654f 100644 --- a/auto/lib/md5/makefile.owc +++ b/auto/lib/md5/makefile.owc @@ -1,5 +1,5 @@ -CFLAGS = -c -zq -bt=nt -bm -ot -op -oi -oe -s $(LIB_OPT) +CFLAGS = -c -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT) md5.lib: wcl386 $(CFLAGS) -dL_ENDIAN md5_dgst.c |