From 88ebe2e2d2e8784ddb7ce9f0fa6c5d55984045eb Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Fri, 14 Jun 2002 04:26:50 +0000 Subject: Use ws2_32.lib instead of wsock32.lib git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14505 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/gss-sample/ChangeLog | 5 +++++ src/appl/gss-sample/Makefile.in | 4 ++-- src/appl/gssftp/ftp/ChangeLog | 5 +++++ src/appl/gssftp/ftp/Makefile.in | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src/appl') diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog index 90a6c06c9..b466bae61 100644 --- a/src/appl/gss-sample/ChangeLog +++ b/src/appl/gss-sample/ChangeLog @@ -1,3 +1,8 @@ +2002-06-13 Ken Raeburn + + * Makefile.in ($(OUTPRE)gss-server.exe, $(OUTPRE)gss-server.exe): + Use ws2_32.lib instead of wsock32.lib. + 2002-04-30 Sam Hartman * gss-server.c (server_establish_context): Same here. diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in index debb00760..42519e922 100644 --- a/src/appl/gss-sample/Makefile.in +++ b/src/appl/gss-sample/Makefile.in @@ -21,10 +21,10 @@ gss-client: gss-client.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(OUTPRE)gss-server.exe: $(OUTPRE)gss-server.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB) - link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib + link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(OUTPRE)gss-client.exe: $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB) - link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib + link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib clean-unix:: $(RM) gss-server gss-client diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index 51d11450a..7953c7782 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -1,3 +1,8 @@ +2002-06-13 Ken Raeburn + + * Makefile.in ($(OUTPRE)ftp.exe): Use ws2_32.lib instead of + wsock32.lib. + 2002-04-11 Sam Hartman * radix.c : Initialize c and D to suppress warning; code was already correct diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in index cc5de00a2..909dc265c 100644 --- a/src/appl/gssftp/ftp/Makefile.in +++ b/src/appl/gssftp/ftp/Makefile.in @@ -37,7 +37,7 @@ ftp: $(OBJS) $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o ftp $(OBJS) $(GSS_LIBS) $(KRB4COMPAT_LIBS) $(OUTPRE)ftp.exe: $(OBJS) $(GLIB) $(KLIB) - link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib advapi32.lib + link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib advapi32.lib clean-unix:: $(RM) ftp -- cgit