Repair some makefile changes which broke the PC build

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5196 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index d684f68b8e24c66d8a5b16d38f1958b1baf7a74f..f4da7e952347ad62d00382a567f39253c6de9d22 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,11 @@
+Wed Mar 22 11:28:08 1995 Keith Vetter (keithv@fusion.com)
+
+       * Makefile.in: put back '##DOSLIBNAME' since it makes the .c.obj rule
+          put the object file into that library.
+       * Makefile.in: strange nmake error 'missing ) on macro invocation' 
+          which only appeared intermitantly and only when invoked 
+           recursively. Fixed (I hope) by interchanging some lines.
+
 Thu Mar 16 21:10:37 1995  John Gilmore  (gnu at toad.com)
 
        * Makefile.in (CFLAGS):  Avoid continuation line that starts with

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 19277d1dc41566d605a148fe65ed23dc881ffefa..e1375b20c614228788c99f2defe250f768fc126f 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -1,6 +1,7 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/crc32 -I$(srcdir)/des -I$(srcdir)/md4 -I$(srcdir)/md5
 
 ##DOSBUILDTOP = ..\..
+##DOSLIBNAME=crypto.lib
 ##DOS!include $(BUILDTOP)\config\windows.in
 
 TST=if test -n "`cat DONE`" ; then
@@ -61,12 +62,12 @@ all-windows::
        cd ..\md4
        @echo Making in crypto\md4
        -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
-       cd ..\md5
-       @echo Making in crypto\md5
-       -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
        cd ..\os
        @echo Making in crypto\os
        -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
+       cd ..\md5
+       @echo Making in crypto\md5
+       -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
        cd ..
 
 clean-windows::