1.1 branch changes -> trunk

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

diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index ab5423f36cc59d738cd20a9c3e04c333840f1c5a..41d694f7351ad5aac8f26199c6ccfd7479ed20fb 100644 (file)
--- 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 b09d3ff3b6b1102c848864ae2771a778bc6fc3ba..4e67ce3bd899216105067a7ec923b50263d8b5c3 100644 (file)
--- 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 24264dc35517020c1d9d0bb4dceda570a71089be..39d7ec8956f4f9cdd0a19ab686ad6931f1cc4e84 100644 (file)
--- 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 6206e09bc02f7d02fc2954d3b189baa459901b08..2308ca22d5eb4813648a8bec2bd9bee7a2d180a3 100644 (file)
--- 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 6c4c6e5d184211448bb1279cc77e451578b7b219..0a6b2f21f8fa938299a613e252e5f458f2ada490 100644 (file)
--- 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 680388e0a12801f6c3ab284787813987ddd6f3e9..b4beb7e6297c6f2e59acbd81cc1ae5fb32dbc374 100644 (file)
--- 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 a7993d4a1302576bf4b2e7de7489a335b3820bf7..ba06e7008113a5d4695634ebec93cde698f65dc2 100644 (file)
--- 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 4aae2e0fc35f8291db0e3554d6d1ab74db0da9b1..a9fed31e2ec205dbac520700bb243a7facd56ff4 100644 (file)
--- 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:$@ $**