--- cygnus/src/lib/Makefile.in	Tue Jul  1 14:09:40 1997
+++ kerbnet-1.2/lib/Makefile.in	Tue May 27 22:00:00 1997
@@ -1,16 +1,22 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..
-##DOS!include $(BUILDTOP)\config\windows.in
+##DOSVERS_DIR = \vers
 
 MAC_SUBDIRS = crypto krb5 gssapi kadm
 
 all-unix::
+	if test -d $(BUILDTOP)/support/tcl/unix ; then \
+	  $(RM) libtcl* ; ln -s $(BUILDTOP)/support/tcl/unix/libtcl* . ; \
+	else : ; fi
+	if test -d $(BUILDTOP)/support/tk/unix ; then \
+	  $(RM) libtk* ; ln -s $(BUILDTOP)/support/tk/unix/libtk* . ; \
+	else : ; fi
 
 all-mac::
 
 CLEANLIBS = libkrb5.a libkdb5.a libcrypto.a libgssapi_krb5.a libdes425.a \
-	libkrb425.a libkadm.a libkrb4.a libkdb4.a libcom_err.a libpty.a \
+	libkrb425.a libkadm.a libkrb4.a libcom_err.a libpty.a \
 	libss.a libkrb5util.a libgssapi.a \
 	libkrb5.so libcrypto.so libkrb4.so libdes425.so
 
@@ -19,10 +25,10 @@
 	$(RM) $(CLEANLIBS)
 
 clean-windows::
-	$(RM) libkrb5.dll libkrb5.lib libkrb5.bak libkrb5.map winsock.lib
-	$(RM) gssapi.dll gssapi.lib gssapi.bak gssapi.map
+	$(RM) *.dll *.exp *.map
+
 #
-# Windows stuff to make libkrb5.dll and libkrb5.lib. Currently it
+# Windows stuff to make krb5_{16,32}.dll and krb5_{16,31}.lib. Currently it
 # combines crypto, krb5, kadm and the util/et directories.
 #
 ALIB  = kadm\kadm.lib
@@ -31,43 +37,76 @@
 GLIB  = gssapi\gssapi.lib
 ETLIB = $(BUILDTOP)\util\et\comerr.lib
 PLIB  = $(BUILDTOP)\util\profile\profile.lib
-WLIB  = .\winsock.lib
-LIBS  = $(ALIB) $(CLIB) $(KLIB) $(GLIB) $(ETLIB) $(PLIB) $(WLIB)
+MISCLIB  = $(BUILDTOP)\util\misc\misc.lib
+DES425LIB = des425\des425.lib
+##WIN16##WLIB  = .\winsock.lib
+LIBS  = $(ALIB) $(CLIB) $(KLIB) $(ETLIB) $(PLIB) $(MISCLIB) $(DES425LIB)
+
+##WIN32##WINLIBS =      libc.lib kernel32.lib advapi32.lib wsock32.lib user32.lib shell32.lib oldnames.lib
+##WIN32##WINDLLFLAGS =  /nodefaultlib /incremental:no /pdb:none /release \
+##WIN32##               /nologo /align:0x1000 /base:0x1c000000 /dll /debug
 
-lib-windows: winsock.lib libkrb5.lib gssapi.lib 
+##WIN16##lib-windows: winsock.lib libkrb5.lib gssapi.lib
+##WIN32##lib-windows: libkrb5.dll gssapi.dll
 
 gssapi.lib:: gssapi.dll
-	implib /nologo gssapi.lib gssapi.dll
+##WIN16##       implib /nologo gssapi.lib gssapi.dll
+##WIN32##       lib /nologo /out:$*.lib /def:$*.def $(GLIB) $(LIBS) win_glue.obj
 
-gssapi.dll:: $(GLIB) $(LIBS) gssapi.def
-	link /co /seg:400 /noe /nod /nol win_glue, gssapi.dll, gssapi.map, \
-	   $(LIBS) ldllcew libw oldnames, gssapi.def
-	rc /nologo /p /k gssapi.dll
+gssapi.dll:: $(GLIB) $(LIBS) gssapi.def win_glue.obj
+##WIN16##       link /co /seg:400 /noe /nod /nol win_glue, gssapi.dll, \
+##WIN16##          gssapi.map, $(LIBS) ldllcew libw oldnames, gssapi.def
+##WIN16##       rc /nologo /p /k gssapi.dll
+##WIN32##       link $(WINDLLFLAGS) \
+##WIN32##          /def:$*.def /out:$*.dll win_glue.obj $(GLIB) $(LIBS) \
+##WIN32##          $(WINLIBS)
 
 libkrb5.lib:: libkrb5.dll
-	implib /nologo libkrb5.lib libkrb5.dll
+##WIN16##       implib /nologo libkrb5.lib libkrb5.dll
+##WIN32##       lib /nologo /out:$*.lib /def:$*.def $(LIBS) win_glue.obj
 
 libkrb5.dll:: $(LIBS) libkrb5.def win_glue.obj
-	link /co /seg:400 /noe /nod /nol win_glue, libkrb5.dll, libkrb5.map, \
-	   $(LIBS) ldllcew libw oldnames, libkrb5.def
-	rc /nologo /p /k libkrb5.dll
+##WIN16##       link /co /seg:400 /noe /nod /nol win_glue, libkrb5.dll, libkrb5.map, \
+##WIN16##          $(LIBS) ldllcew libw oldnames, libkrb5.def
+##WIN16##       rc /nologo /p /k libkrb5.dll
+##WIN32##       link $(WINDLLFLAGS) \
+##WIN32##          /def:$*.def /out:$*.dll win_glue.obj $(LIBS) \
+##WIN32##          $(WINLIBS)
+
+sap_glue.obj: win_glue.c
+	$(CC) $(CFLAGS) -DSAP_VERSERV -I$(VERS_DIR) /c \
+		/Fosap_glue.obj win_glue.c
+
+win_glue.obj: win_glue.c
+	$(CC) $(CFLAGS) /c win_glue.c
+
+sapkrb5.dll:: $(GLIB) $(LIBS) sapkrb5.def sap_glue.obj
+##WIN16##       link /co /seg:400 /noe /nod /nol sap_glue, $*.dll, $*.map, \
+##WIN16##          $(LIBS) $(VERS_DIR)\vswin.lib ldllcew libw oldnames, $*.def
+##WIN16##       rc /nologo /p /k sapkrb5.dll
+##WIN32##       link $(WINDLLFLAGS) \
+##WIN32##          /def:$*.def /out:$*.dll sap_glue.obj $(LIBS) \
+##WIN32##          $(VERS_DIR)\vswin.lib $(WINLIBS)
 
-winsock.lib:  winsock.def
-	implib /nologo winsock.lib winsock.def
+##WIN16##winsock.lib:  winsock.def
+##WIN16##       implib /nologo winsock.lib winsock.def
 
 all-windows:: 
 	@echo Making in lib\crypto
 	cd crypto
-	-$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
+	$(MAKE) -$(MFLAGS)
 	@echo Making in lib\kadm
 	cd ..\kadm
-	-$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
+	$(MAKE) -$(MFLAGS)
 	@echo Making in lib\krb5
 	cd ..\krb5
-	-$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
+	$(MAKE) -$(MFLAGS)
 	@echo Making in lib\gssapi
 	cd ..\gssapi
-	-$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
+	$(MAKE) -$(MFLAGS)
+	@echo Making in lib\des425
+	cd ..\des425
+	$(MAKE) -$(MFLAGS)
 	@echo Making in lib
 	cd ..
 
@@ -76,16 +115,24 @@
 clean-windows::
 	@echo Making clean in lib\crypto
 	cd crypto
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib\kadm
 	cd ..\kadm
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib\krb5
 	cd ..\krb5
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib\gssapi
 	cd ..\gssapi
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
+	@echo Making clean in lib\des425
+	cd ..\des425
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib
 	cd ..
 
+install-windows:: libkrb5.dll libkrb5.lib gssapi.dll gssapi.lib
+	copy libkrb5.dll $(DESTDIR)
+	copy libkrb5.lib $(DESTDIR)
+	copy gssapi.dll $(DESTDIR)
+	copy gssapi.lib $(DESTDIR)