pullup from trunk

ticket: 2802
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16939 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index a00fc94d74ebcf5cbc07bbc574faf046c0cc4819..f0f4014875d56f165d5a20281ff24f0ed57a4da6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-15  Jeffrey Altman <jaltman@mit.edu>
+
+        * Makefile.in: build/clean/install/etc kcpytkt,kdeltkt,ms2mit
+
 2004-11-19  Tom Yu  <tlyu@mit.edu>
 
        * aclocal.m4 (KRB5_AC_PRIOCNTL_HACK): Check for Solaris patch

diff --git a/src/Makefile.in b/src/Makefile.in
index 23954c52b39a78cd21813b592c34adbc8cd18ce6..3a94a769e8ef9bd43ca8d00a27d005cc9eef035d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -146,6 +146,7 @@ WINMAKEFILES=Makefile \
        clients\Makefile clients\kdestroy\Makefile \
        clients\kinit\Makefile clients\klist\Makefile \
        clients\kpasswd\Makefile clients\kvno\Makefile \
+       clients\kcpytkt\Makefile clients\kdeltkt\Makefile \
        include\Makefile include\krb5\Makefile \
        krb524\Makefile \
        lib\Makefile lib\crypto\Makefile \
@@ -197,6 +198,10 @@ WINMAKEFILES=Makefile \
 ##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##clients\kvno\Makefile: clients\kvno\Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
+##DOS##clients\kcpytkt\Makefile: clients\kcpytkt\Makefile.in $(MKFDEP)
+##DOS##        $(WCONFIG) config < $@.in > $@
+##DOS##clients\kdeltkt\Makefile: clients\kdeltkt\Makefile.in $(MKFDEP)
+##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##include\Makefile: include\Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##include\krb5\Makefile: include\krb5\Makefile.in $(MKFDEP)
@@ -330,7 +335,7 @@ ren2long:
 ZIP=zip
 FILES= ./* \
        clients/* clients/kdestroy/* clients/kinit/* clients/klist/* \
-       clients/kpasswd/* \
+       clients/kpasswd/* clients/kcpytkt/* clients/kdeltkt/* \
        config/* include/* include/kerberosIV/* \
        include/krb5/* include/krb5/stock/* include/sys/* krb524/* lib/* \
        lib/crypto/* lib/crypto/crc32/* lib/crypto/des/* lib/crypto/dk/* \
@@ -534,11 +539,14 @@ install-windows::
        $(CP) windows\gss\$(OUTPRE)gss.exe "$(KRB_INSTALL_DIR)\bin\."
        $(CP) appl\gss-sample\$(OUTPRE)gss-server.exe "$(KRB_INSTALL_DIR)\bin\."
        $(CP) appl\gss-sample\$(OUTPRE)gss-client.exe "$(KRB_INSTALL_DIR)\bin\."
+       $(CP) windows\ms2mit\$(OUTPRE)ms2mit.exe "$(KRB_INSTALL_DIR)\bin\."
        $(CP) appl\gssftp\ftp\$(OUTPRE)ftp.exe "$(KRB_INSTALL_DIR)\bin\."
        $(CP) clients\kvno\$(OUTPRE)kvno.exe "$(KRB_INSTALL_DIR)\bin\."
        $(CP) clients\klist\$(OUTPRE)klist.exe "$(KRB_INSTALL_DIR)\bin\."
        $(CP) clients\kinit\$(OUTPRE)kinit.exe "$(KRB_INSTALL_DIR)\bin\."
        $(CP) clients\kdestroy\$(OUTPRE)kdestroy.exe "$(KRB_INSTALL_DIR)\bin\."
+       $(CP) clients\kcpytkt\$(OUTPRE)kcpytkt.exe "$(KRB_INSTALL_DIR)\bin\."
+       $(CP) clients\kdeltkt\$(OUTPRE)kdeltkt.exe "$(KRB_INSTALL_DIR)\bin\."
        $(CP) clients\kpasswd\$(OUTPRE)kpasswd.exe "$(KRB_INSTALL_DIR)\bin\."
        @if exist "$(KRB_INSTALL_DIR)\bin\krb4_32.dll" del "$(KRB_INSTALL_DIR)\bin\krb4_32.dll"
        @if exist "$(KRB_INSTALL_DIR)\lib\krb4_32.lib" del "$(KRB_INSTALL_DIR)\lib\krb4_32.lib"

diff --git a/src/clients/ChangeLog b/src/clients/ChangeLog
index 46669142cc7eeefc0a32a16774842ded51891258..64379363823732b7973bc09f28dfb1c7d9a1e637 100644 (file)
--- a/src/clients/ChangeLog
+++ b/src/clients/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-15  Jeffrey Altman <jaltman@mit.edu>
+
+        * Makefile.in: output status info for kcpytkt, kdeltkt
+
 2004-08-20  Jeffrey Altman <jaltman@mit.edu>
 
         * Add kcpytkt and kdeltkt directories

diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in
index f68d6fffa97ad029c71136b9b4eb0e6769076ea4..f1c8be6e29af2f65ef0af3c321cd6e2e86973aee 100644 (file)
--- a/src/clients/Makefile.in
+++ b/src/clients/Makefile.in
@@ -22,8 +22,10 @@ all-windows::
        @echo Making all in clients\kvno
        cd ..\kvno
        $(MAKE) -$(MFLAGS)
+       @echo Making all in clients\kcpytkt
        cd ..\kcpytkt
        $(MAKE) -$(MFLAGS)
+       @echo Making all in clients\kdeltkt
        cd ..\kdeltkt
        $(MAKE) -$(MFLAGS)
        cd ..
@@ -44,8 +46,10 @@ clean-windows::
        @echo Making clean in clients\kvno
        cd ..\kvno
        $(MAKE) -$(MFLAGS) clean
+       @echo Making clean in clients\kcpytkt
        cd ..\kcpytkt
        $(MAKE) -$(MFLAGS) clean
+       @echo Making clean in clients\kdeltkt
        cd ..\kdeltkt
        $(MAKE) -$(MFLAGS) clean
        cd ..

diff --git a/src/clients/kdeltkt/ChangeLog b/src/clients/kdeltkt/ChangeLog
index 19092315f27dd2c6eec62210015a32891c682973..35a25951f83f00593b4301e31ff26a6b611dfaf6 100644 (file)
--- a/src/clients/kdeltkt/ChangeLog
+++ b/src/clients/kdeltkt/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-15  Jeffrey Altman <jaltman@mit.edu>
+
+        * Makefile.in: correct the makefile to build kdeltkt, not kvno
+
 2004-08-19  Jeffrey Altman <jaltman@mit.edu>
 
        * kdeltkt.c, kdeltkt.M: Create a new application.

diff --git a/src/clients/kdeltkt/Makefile.in b/src/clients/kdeltkt/Makefile.in
index 09215940d23f6745558f1399699994378d3f7379..d7d371a79c6da8d54f6c38e415aa5650ac7d7db3 100644 (file)
--- a/src/clients/kdeltkt/Makefile.in
+++ b/src/clients/kdeltkt/Makefile.in
@@ -1,26 +1,26 @@
 thisconfigdir=./..
-myfulldir=clients/kvno
+myfulldir=clients/kdeltkt
 mydir=kvno
 BUILDTOP=$(REL)..$(S)..
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-all-unix:: kvno
-all-windows:: $(OUTPRE)kvno.exe
+all-unix:: kdeltkt
+all-windows:: $(OUTPRE)kdeltkt.exe
 all-mac::
 
-kvno: kvno.o $(KRB4COMPAT_DEPLIBS)
-       $(CC_LINK) -o $@ kvno.o $(KRB4COMPAT_LIBS)
+kdeltkt: kdeltkt.o $(KRB4COMPAT_DEPLIBS)
+       $(CC_LINK) -o $@ kdeltkt.o $(KRB4COMPAT_LIBS)
 
-$(OUTPRE)kvno.exe: $(OUTPRE)kvno.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB)
+$(OUTPRE)kdeltkt.exe: $(OUTPRE)kdeltkt.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB)
        link $(EXE_LINKOPTS) /out:$@ $**
 
 clean-unix::
-       $(RM) kvno.o kvno
+       $(RM) kdeltkt.o kdeltkt
 
 install-unix::
-       for f in kvno; do \
+       for f in kdeltkt; do \
          $(INSTALL_PROGRAM) $$f \
                $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
          $(INSTALL_DATA) $(srcdir)/$$f.M \