Windows/NT integration

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

4 files changed, 65 insertions, 17 deletions

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index cd043b2261..71b60e9b1a 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,8 +1,30 @@
+Tue Feb  4 15:56:41 1997  Richard Basch  <basch@lehman.com>
+
+	* windows.in: Do not bother to define INTERFACE or INTERFACE_C
+
+Sun Feb  2 23:30:17 1997  Richard Basch  <basch@lehman.com>
+
+	* windows.in:
+		Compile with /Ld to link dynamic libraries (win16)
+		Compile DLL objects with /DKRB5_DLL_FILE (win16)
+
+Thu Jan 30 22:08:42 1997  Richard Basch  <basch@lehman.com>
+
+	* windows.in:
+		Compile with /MD to link against the runtime library (win32)
+
 Tue Dec 24 16:43:45 1996  Tom Yu  <tlyu@mit.edu>
 
 	* config.guess:
 	* config.sub: Update from autoconf-2.12.
 
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+	* rm.bat: Do the work first; the comments are at the end so as
+		to improve the speed of the script significantly (20%)
+	* windows.in: corrected typo (all-windows) and added win32 support
+	* win-post.in: win16/win32 support
+
 Mon Nov 11 20:53:01 1996  Tom Yu  <tlyu@mit.edu>
 
 	* pre.in (DEJAFLAGS): Change gmake-dependent $(shell uname foo) to
diff --git a/src/config/rm.bat b/src/config/rm.bat
index fd502fdbef..4cb1c88228 100644
--- a/src/config/rm.bat
+++ b/src/config/rm.bat
@@ -1,4 +1,10 @@
 @echo off
+:loop
+if exist %1 del %1
+shift
+if not %1.==. goto loop
+exit
+
 Rem
 Rem rm.bat
 Rem
@@ -24,7 +30,3 @@ Rem
 Rem
 Rem Batch file to mimic the functionality of the Unix rm command
 Rem
-:loop
-if exist %1 del %1
-shift
-if not %1.==. goto loop
diff --git a/src/config/win-post.in b/src/config/win-post.in
index c70eda72cd..42a4ba0c2b 100644
--- a/src/config/win-post.in
+++ b/src/config/win-post.in
@@ -6,10 +6,19 @@ all::
 .c.obj:
 	$(CC) $(CFLAGS) /c $*.c
 !if defined(LIBNAME)
-!if "$(LIBCMD)"!="rem"
 ##WIN16##	$(LIBCMD) $(PAGESIZE) /nologo $(LIBNAME) -+$@;
-##WIN32##	$(LIBCMD) /out:$(LIBNAME) /nologo $@
-!endif
+
+##WIN32##!if !defined(OBJFILELIST)
+##WIN32##OBJFILELIST=@$(OBJFILE)
+##WIN32##!endif
+##WIN32##!if !defined(OBJFILEDEP)
+##WIN32##OBJFILEDEP=$(OBJFILE)
+##WIN32##!endif
+
+##WIN32##all-windows:: $(LIBNAME)
+##WIN32##$(LIBNAME): $(OBJFILEDEP)
+##WIN32##	$(LIBCMD) /out:$(LIBNAME) /nologo $(OBJFILELIST)
+
 !endif
 
 check::
@@ -43,4 +52,13 @@ clean-unix::
 
 clean-windows::
 	$(RM) *.$(OBJEXT)
-	$(RM) msvc.pdb *.err
+	$(RM) msvc.pdb *.err *.exe
+
+!if defined(LIBNAME)
+clean-windows::
+	$(RM) $(LIBNAME)
+!endif
+!if defined(OBJFILE)
+clean-windows::
+	$(RM) $(OBJFILE)
+!endif
diff --git a/src/config/windows.in b/src/config/windows.in
index 4efcc419b4..360e64c598 100644
--- a/src/config/windows.in
+++ b/src/config/windows.in
@@ -1,5 +1,3 @@
-# Microsoft Windows configuration file for Cygnus Kerberos
-# ***copy from K4***
 
 WHAT=windows
 
@@ -11,7 +9,7 @@ install:: install-$(WHAT)
 
 check:: check-$(WHAT)
 
-all-windiws::
+all-windows::
 clean-windows::
 install-windows::
 check-windows::
@@ -24,7 +22,7 @@ S=\		# seperator
 U=..\		# up one level
 
 srcdir = .
-SRCTOP = $(srcdir)/$(BUILDTOP)
+SRCTOP = $(srcdir)\$(BUILDTOP)
 
 # /* The name of the C compiler for the target */
 CC=cl /nologo
@@ -32,14 +30,14 @@ CL=
 #
 # CCOPTS for DLL functions
 #
-##WIN16##CCOPTS=/ALw /Zp /GD2s /Os /Zi /Od /W3 $(XTRA)
-##WIN32##CCOPTS=/Os /Zi /Od /W3 $(XTRA) -DKRB5_DLL_FILE
+##WIN16##CCOPTS=/ALw /Zp /GD2s /Os /Zi /Od /W3 /Ld $(XTRA) /DKRB5_DLL_FILE
+##WIN32##CCOPTS=/Os /Zi /Od /W3 /MD $(XTRA) -DKRB5_DLL_FILE
 #
 # CCOPTS for non-DLL compiles
 #
-##WIN16##CCOPTS2=/AL /Zp /G2s  /Os /Zi /Od /W3 -DINTERFACE= -DINTERFACE_C= $(XTRA)
-##WIN32##CCOPTS2=/Os /Zi /Od /W3 -DINTERFACE= -DINTERFACE_C= $(XTRA)
-CPPFLAGS =  -I$(SRCTOP)/include -I$(SRCTOP)/include/krb5
+##WIN16##CCOPTS2=/AL /Zp /G2s  /Os /Zi /Od /W3 $(XTRA)
+##WIN32##CCOPTS2=/Os /Zi /Od /W3 $(XTRA)
+CPPFLAGS =  -I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 -DLEHMAN
 DEFS = $(CPPFLAGS)
 CFLAGS2 = $(CCOPTS2) $(DEFS)
 
@@ -61,12 +59,20 @@ DBG_LIB=/nologo /Zp /ALw /GD /Gs /Os /G2 /Zi /Od
 DBG=/nologo /Zp /AL /Os /Mq /Zi /Od
 
 RM=$(BUILDTOP)\config\rm.bat
+LIBECHO=$(BUILDTOP)\util\windows\libecho
 CP=copy
 MV=ren
 LN=copy
 LIBCMD=lib
 PAGESIZE=/pagesize:128
 AWK=rem
+RC = rc
+CVTRES = cvtres
+
+##WIN16##KLIB=$(BUILDTOP)\lib\krb5_16.lib
+##WIN32##KLIB=$(BUILDTOP)\lib\krb5_32.lib
+##WIN16##GLIB=$(BUILDTOP)\lib\gssapi.lib
+##WIN32##GLIB=$(BUILDTOP)\lib\gssapi32.lib
 
 ARADD=rem
 RANLIB=rem