Skip to content

Commit

Permalink
Remove wshelper library
Browse files Browse the repository at this point in the history
ticket: 8687
  • Loading branch information
greghudson committed Jun 12, 2018
1 parent 67de45e commit 76aaa78
Show file tree
Hide file tree
Showing 38 changed files with 4 additions and 4,846 deletions.
9 changes: 1 addition & 8 deletions src/Makefile.in
Expand Up @@ -150,7 +150,6 @@ WINMAKEFILES=Makefile \
util\et\Makefile util\profile\Makefile util\profile\testmod\Makefile \
util\support\Makefile \
util\windows\Makefile \
util\wshelper\Makefile \
windows\Makefile windows\lib\Makefile windows\ms2mit\Makefile \
windows\kfwlogon\Makefile windows\leashdll\Makefile \
windows\leash\Makefile windows\leash\htmlhelp\Makefile \
Expand Down Expand Up @@ -264,8 +263,6 @@ WINMAKEFILES=Makefile \
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##util\windows\Makefile: util\windows\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##util\wshelper\Makefile: util\wshelper\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##windows\Makefile: windows\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##windows\lib\Makefile: windows\lib\Makefile.in $(MKFDEP)
Expand Down Expand Up @@ -466,9 +463,6 @@ install-windows:
copy windows\kfwlogon\$(OUTPRE)*.exe "$(KRB_INSTALL_DIR)\bin\."
copy windows\kfwlogon\$(OUTPRE)*.dll "$(KRB_INSTALL_DIR)\bin\."
$(INSTALLDBGSYMS) windows\kfwlogon\$(OUTPRE)*.pdb "$(KRB_INSTALL_DIR)\bin\."
copy util\wshelper\$(OUTPRE)$(DLIB).lib "$(KRB_INSTALL_DIR)\lib\."
copy util\wshelper\$(OUTPRE)$(DLIB).dll "$(KRB_INSTALL_DIR)\bin\."
$(INSTALLDBGSYMS) util\wshelper\$(OUTPRE)$(DLIB).pdb "$(KRB_INSTALL_DIR)\bin\."
copy ccapi\lib\win\srctmp\$(OUTPRE)$(CCLIB).dll "$(KRB_INSTALL_DIR)\bin\."
$(INSTALLDBGSYMS) ccapi\lib\win\srctmp\$(OUTPRE)$(CCLIB).pdb "$(KRB_INSTALL_DIR)\bin\."
copy ccapi\lib\win\srctmp\$(CCLIB).lib "$(KRB_INSTALL_DIR)\lib\."
Expand Down Expand Up @@ -647,8 +641,7 @@ OTHEREXCLUDES = \
util/profile/profile_tcl.c \
util/support/fnmatch.c \
util/verto \
util/k5ev \
util/wshelper
util/k5ev

EXCLUDES = `for i in $(BSDFILES) $(OTHEREXCLUDES); do echo $$i; done | $(AWK) '{ print "-path", $$1, "-o" }'` -path /dev/null

Expand Down
2 changes: 0 additions & 2 deletions src/config/win-pre.in
Expand Up @@ -182,7 +182,6 @@ KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_32.lib
K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_32.lib
SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt32.lib
GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi32.lib
DLIB=wshelp32
CCLIB=krbcc32
SPAKELIB=spake32
WLIB=
Expand All @@ -194,7 +193,6 @@ KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_64.lib
K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_64.lib
SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt64.lib
GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi64.lib
DLIB=wshelp64
CCLIB=krbcc64
SPAKELIB=spake64
WLIB=
Expand Down
2 changes: 1 addition & 1 deletion src/lib/krb5/os/Makefile.in
Expand Up @@ -182,7 +182,7 @@ t_locate_kdc: t_locate_kdc.o
t_locate_kdc.o: t_locate_kdc.c locate_kdc.c dnssrv.c dnsglue.c
$(OUTPRE)t_locate_kdc.exe: $(OUTPRE)t_locate_kdc.obj \
$(KLIB) $(PLIB) $(CLIB) $(SLIB)
link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(DNSLIBS)
link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib

t_trace: $(T_TRACE_OBJS) $(KRB5_BASE_DEPLIBS)
$(CC_LINK) -o t_trace $(T_TRACE_OBJS) $(KRB5_BASE_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion src/util/Makefile.in
Expand Up @@ -6,7 +6,7 @@ mydir=util
SUBDIRS=support $(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
profile $(MAYBE_VERTO_@VERTO_VERSION@)
##WIN32##!endif
WINSUBDIRS=windows support et profile wshelper
WINSUBDIRS=windows support et profile
BUILDTOP=$(REL)..

MAYBE_ET_k5 = et
Expand Down
64 changes: 0 additions & 64 deletions src/util/wshelper/Makefile.in

This file was deleted.

262 changes: 0 additions & 262 deletions src/util/wshelper/dllmain.c

This file was deleted.

0 comments on commit 76aaa78

Please sign in to comment.