nginx-0.0.2-2004-03-09-22:47:07 import
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf
index 06006e4..3c78783 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -12,13 +12,25 @@
CORE_INCS="$CORE_INCS -I $MD5"
- if [ "$PLATFORM" = "win32" ]; then
- CORE_LIBS="$CORE_LIBS md5.lib"
- CORE_LINK="$CORE_LINK -libpath:$MD5"
- else
- LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
- CORE_LIBS="$CORE_LIBS -L $MD5 -lmd5"
- fi
+ case $CC in
+
+ cl)
+ LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
+ CORE_LIBS="$CORE_LIBS md5.lib"
+ CORE_LINK="$CORE_LINK -libpath:$MD5"
+ ;;
+
+ wcl386)
+ LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
+ CORE_LIBS="$CORE_LIBS $MD5/md5.lib"
+ ;;
+
+ *)
+ LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
+ CORE_LIBS="$CORE_LIBS -L $MD5 -lmd5"
+ ;;
+
+ esac
else
diff --git a/auto/lib/md5/make b/auto/lib/md5/make
index 0b4d927..43d35bf 100644
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@@ -1,24 +1,56 @@
-echo "$MD5/libmd5.a:" >> $MAKEFILE
+case $CC in
+
+ cl)
+ makefile=makefile.msvc
+ ;;
+
+ wcl386)
+ makefile=makefile.owc
+ ;;
+
+esac
+
case $PLATFORM in
+ win32)
+ echo "$MD5/md5.lib:" >> $MAKEFILE
+ ;;
+
+ *)
+ echo "$MD5/libmd5.a:" >> $MAKEFILE
+ ;;
+
+esac
+
+
+case $PLATFORM in
+
+ win32)
+
+ cp auto/lib/md5/$makefile $MD5
+ echo " cd $MD5" >> $MAKEFILE
+ echo " \$(MAKE) -f $makefile OWC_OPT=$OWC_OPT" >> $MAKEFILE
+ echo " cd ..\\..\\.." >> $MAKEFILE
+ ;;
+
SunOS:*:i386)
- echo " cd $MD5 && \$(MAKE) x86-solaris" >> $MAKEFILE
+ echo " cd $MD5 && \$(MAKE) x86-solaris" >> $MAKEFILE
;;
*:i386)
- echo " cd $MD5 && \$(MAKE) x86-elf" >> $MAKEFILE
+ echo " cd $MD5 && \$(MAKE) x86-elf" >> $MAKEFILE
;;
*)
if [ $CC = gcc ]; then
- echo " cd $MD5 && \$(MAKE) gcc" >> $MAKEFILE
+ echo " cd $MD5 && \$(MAKE) gcc" >> $MAKEFILE
else
- echo " cd $MD5 && \$(MAKE) cc" >> $MAKEFILE
+ echo " cd $MD5 && \$(MAKE) cc" >> $MAKEFILE
fi
;;
esac
-echo >> $MAKEFILE
+echo >> $MAKEFILE
diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc
index a45fc52..3dbda09 100644
--- a/auto/lib/md5/makefile.msvc
+++ b/auto/lib/md5/makefile.msvc
@@ -1,6 +1,6 @@
-all:
- cl -nologo -c -MT -O2 -Ob1 -Oi -Gs -D MD5_ASM -D L_ENDIAN \
- md5_dgst.c md5_one.c
+CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs -D MD5_ASM -D L_ENDIAN
- link -lib -out:md5.lib md5_dgst.obj md5_one.obj asm/m-win32.obj
+md5.lib:
+ cl $(CFLAGS) md5_dgst.c
+ link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj
diff --git a/auto/lib/md5/makefile.owc b/auto/lib/md5/makefile.owc
new file mode 100644
index 0000000..f320940
--- /dev/null
+++ b/auto/lib/md5/makefile.owc
@@ -0,0 +1,12 @@
+
+CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s $(OWC_OPT)
+
+md5.lib:
+ wcl386 $(CFLAGS) -bm -dL_ENDIAN md5_dgst.c
+ wlib -n md5.lib md5_dgst.obj
+
+#md5.lib:
+asm:
+ wcl386 $(CFLAGS) -bm -dMD5_ASM -dL_ENDIAN md5_dgst.c
+ wcl386 $(CFLAGS) asm\m-win32.asm
+ wlib -n md5.lib md5_dgst.obj m-win32.obj
