krb5 commit: Stop building CNS for Windows
Greg Hudson <[email protected]>
| Newsgroups | gmane.comp.encryption.kerberos.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://github.com/krb5/krb5/commit/eb7bfc4fc2ae87e980f0d5cef14927512f35704e commit eb7bfc4fc2ae87e980f0d5cef14927512f35704e Author: Greg Hudson <[email protected]> Date: Fri May 11 13:43:42 2018 -0400 Stop building CNS for Windows CNS is an old Windows ticket manager which was long ago supplanted by leash. We have been building it and copying it in "nmake install", but not including it in the KfW installer. Remove it from the build, and trim windows/lib down to just the part used by leashdll and leash (loadfuncs.obj). Also stop generating a Makefile for windows/wintel; it was removed from the build in commit 530043377ee6f39b9ca95c13f6260602e6fe7674. ticket: 8682 (new) src/Makefile.in | 14 +++----------- src/windows/Makefile.in | 2 +- src/windows/lib/Makefile.in | 5 ++--- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 77beff8..db6c0df 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -150,11 +150,9 @@ WINMAKEFILES=Makefile \ util\support\Makefile \ util\windows\Makefile \ util\wshelper\Makefile \ - windows\Makefile windows\lib\Makefile \ - windows\cns\Makefile windows\ms2mit\Makefile \ - windows\wintel\Makefile windows\kfwlogon\Makefile \ - windows\leashdll\Makefile windows\leash\Makefile \ - windows\leash\htmlhelp\Makefile + windows\Makefile windows\lib\Makefile windows\ms2mit\Makefile \ + windows\kfwlogon\Makefile windows\leashdll\Makefile \ + windows\leash\Makefile windows\leash\htmlhelp\Makefile ##DOS##Makefile-windows: $(MKFDEP) $(WINMAKEFILES) @@ -270,12 +268,8 @@ WINMAKEFILES=Makefile \ ##DOS## $(WCONFIG) config < [email protected] > $@ ##DOS##windows\lib\Makefile: windows\lib\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < [email protected] > $@ -##DOS##windows\cns\Makefile: windows\cns\Makefile.in $(MKFDEP) -##DOS## $(WCONFIG) config < [email protected] > $@ ##DOS##windows\ms2mit\Makefile: windows\ms2mit\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < [email protected] > $@ -##DOS##windows\wintel\Makefile: windows\wintel\Makefile.in $(MKFDEP) -##DOS## $(WCONFIG) config < [email protected] > $@ ##DOS##windows\kfwlogon\Makefile: windows\kfwlogon\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < [email protected] > $@ ##DOS##windows\leashdll\Makefile: windows\leashdll\Makefile.in $(MKFDEP) @@ -447,8 +441,6 @@ install-windows: copy lib\$(OUTPRE)*.lib "$(KRB_INSTALL_DIR)\lib\." copy lib\$(OUTPRE)*.dll "$(KRB_INSTALL_DIR)\bin\." $(INSTALLDBGSYMS) lib\$(OUTPRE)*.pdb "$(KRB_INSTALL_DIR)\bin\." - copy windows\cns\$(OUTPRE)krb5.exe "$(KRB_INSTALL_DIR)\bin\." - $(INSTALLDBGSYMS) windows\cns\$(OUTPRE)krb5.pdb "$(KRB_INSTALL_DIR)\bin\." copy appl\gss-sample\$(OUTPRE)gss-server.exe "$(KRB_INSTALL_DIR)\bin\." $(INSTALLDBGSYMS) appl\gss-sample\$(OUTPRE)gss-server.pdb "$(KRB_INSTALL_DIR)\bin\." copy appl\gss-sample\$(OUTPRE)gss-client.exe "$(KRB_INSTALL_DIR)\bin\." diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in index b3011f6..bfc27b6 100644 --- a/src/windows/Makefile.in +++ b/src/windows/Makefile.in @@ -3,4 +3,4 @@ NO_OUTPRE=1 !ifndef NO_LEASH LEASH=leash !endif -SUBDIRS= lib leashdll $(LEASH) cns ms2mit kfwlogon +SUBDIRS= lib leashdll $(LEASH) ms2mit kfwlogon diff --git a/src/windows/lib/Makefile.in b/src/windows/lib/Makefile.in index eaaaecd..50044e2 100644 --- a/src/windows/lib/Makefile.in +++ b/src/windows/lib/Makefile.in @@ -4,11 +4,10 @@ LOCALINCLUDES = -I$(BUILDTOP)\windows\include lib-windows: $(OUTPRE)libwin.lib -SRCS= vardlg.c gic.c registry.c loadfuncs.c +SRCS= loadfuncs.c -OBJS= $(OUTPRE)vardlg.obj $(OUTPRE)gic.obj $(OUTPRE)registry.obj \ - $(OUTPRE)loadfuncs.obj +OBJS= $(OUTPRE)loadfuncs.obj $(OUTPRE)libwin.lib: $(OBJS)