8 files changed, 28 insertions, 41 deletions
diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index ab5423f..41d694f 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-03  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Windows fix for 10/26/99 cleanup.
+
 1999-10-26  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index b09d3ff..4e67ce3 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -2,28 +2,19 @@ thisconfigdir=./..
 myfulldir=clients/kdestroy
 mydir=kdestroy
 BUILDTOP=$(REL)$(U)$(S)$(U)
-##DOS##BUILDTOP=..\..
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
 all-unix:: kdestroy
-all-windows::
+all-windows:: $(OUTPRE)kdestroy.exe
 all-mac::
 
 kdestroy: kdestroy.o $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o $@ kdestroy.o $(KRB5_BASE_LIBS)
 
-
-
-##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
-##WIN32##CFLAGS = $(CCOPTS2)
-##WIN32##CPPFLAGS = $(INCLUDES)
-
-##WIN32##all-windows:: $(OUTPRE)kdestroy.exe
-##WIN32##$(OUTPRE)kdestroy.exe: $(OUTPRE)kdestroy.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB)
-##WIN32##	link $(LINKOPTS2) -out:$@ $**
-
+$(OUTPRE)kdestroy.exe: $(OUTPRE)kdestroy.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB)
+	link $(EXE_LINKOPTS) -out:$@ $**
 
 clean-unix::
 	$(RM) kdestroy.o kdestroy
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index 24264dc..39d7ec8 100644
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-03  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Windows fix for 10/26/99 cleanup.
+
 1999-10-26  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index 6206e09..2308ca2 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -2,27 +2,19 @@ thisconfigdir=./..
 myfulldir=clients/kinit
 mydir=kinit
 BUILDTOP=$(REL)$(U)$(S)$(U)
-##DOS##BUILDTOP=..\..
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
 all-unix:: kinit
-all-windows::
+all-windows:: $(OUTPRE)kinit.exe
 all-mac::
 
 kinit: kinit.o $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o $@ kinit.o $(KRB5_BASE_LIBS)
 
-
-##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
-##WIN32##CFLAGS = $(CCOPTS2)
-##WIN32##CPPFLAGS = $(INCLUDES)
-
-##WIN32##all-windows:: $(OUTPRE)kinit.exe
-##WIN32##$(OUTPRE)kinit.exe: $(OUTPRE)kinit.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB)
-##WIN32##	link $(LINKOPTS2) -out:$@ $**
-
+$(OUTPRE)kinit.exe: $(OUTPRE)kinit.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB)
+	link $(EXE_LINKOPTS) -out:$@ $**
 
 clean-unix::
 	$(RM) kinit.o kinit
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index 6c4c6e5..0a6b2f2 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -3,6 +3,10 @@
 	* klist.c (one_addr): Always use indicated address family and
 	length in gethostbyaddr or getipnodebyaddr calls.
 
+1999-12-03  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Windows fix for 10/26/99 cleanup.
+
 1999-10-26  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 680388e..b4beb7e 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -7,22 +7,15 @@ PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
 all-unix:: klist
-all-windows::
+all-windows:: $(OUTPRE)klist.exe
 all-mac::
 
 
 klist: klist.o $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o $@ klist.o $(KRB5_BASE_LIBS)
 
-
-##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
-##WIN32##CFLAGS = $(CCOPTS2)
-##WIN32##CPPFLAGS = $(INCLUDES)
-
-##WIN32##all-windows:: $(OUTPRE)klist.exe
-##WIN32##$(OUTPRE)klist.exe: $(OUTPRE)klist.obj $(KLIB) $(CLIB)
-##WIN32##	link $(LINKOPTS2) -out:$@ $** wsock32.lib
-
+$(OUTPRE)klist.exe: $(OUTPRE)klist.obj $(KLIB) $(CLIB)
+	link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib
 
 clean-unix::
 	$(RM) klist.o klist
diff --git a/src/clients/kpasswd/ChangeLog b/src/clients/kpasswd/ChangeLog
index a7993d4..ba06e70 100644
--- a/src/clients/kpasswd/ChangeLog
+++ b/src/clients/kpasswd/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-03  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Windows fix for 10/26/99 cleanup.
+
 1999-10-26  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in
index 4aae2e0..a9fed31 100644
--- a/src/clients/kpasswd/Makefile.in
+++ b/src/clients/kpasswd/Makefile.in
@@ -5,8 +5,6 @@ BUILDTOP=$(REL)$(U)$(S)$(U)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-##DOSBUILDTOP=..\..
-
 kpasswd: kpasswd.o $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o kpasswd kpasswd.o $(KRB5_BASE_LIBS)
 
@@ -21,10 +19,7 @@ install-all install-kdc install-server install-client install-unix::
 	$(INSTALL_PROGRAM) kpasswd $(DESTDIR)$(CLIENT_BINDIR)/`echo kpasswd|sed '$(transform)'`
 	$(INSTALL_DATA) $(srcdir)/kpasswd.M $(DESTDIR)$(CLIENT_MANDIR)/`echo kpasswd|sed '$(transform)'`.1;
 
-##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
-##WIN32##CFLAGS = $(CCOPTS2)
-##WIN32##CPPFLAGS = $(INCLUDES)
+all-windows:: $(OUTPRE)kpasswd.exe
 
-##WIN32##all-windows:: $(OUTPRE)kpasswd.exe
-##WIN32##$(OUTPRE)kpasswd.exe: $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB)
-##WIN32##	link $(LINKOPTS2) -out:$@ $**
+$(OUTPRE)kpasswd.exe: $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB)
+	link $(EXE_LINKOPTS) -out:$@ $**