summaryrefslogtreecommitdiffstats
path: root/src/windows
diff options
context:
space:
mode:
authorJeffrey Altman <jaltman@secure-endpoints.com>2004-02-12 13:52:56 +0000
committerJeffrey Altman <jaltman@secure-endpoints.com>2004-02-12 13:52:56 +0000
commitebc2280102d9bcfabe73818bf3b55aaa5265b9e8 (patch)
tree3b9d5576023eef234022452d1623802e30e3b677 /src/windows
parent3b4f1e4465c0166e572d09da434e818f9f04cfc5 (diff)
downloadkrb5-ebc2280102d9bcfabe73818bf3b55aaa5265b9e8.tar.gz
krb5-ebc2280102d9bcfabe73818bf3b55aaa5265b9e8.tar.xz
krb5-ebc2280102d9bcfabe73818bf3b55aaa5265b9e8.zip
2004-02-12 Jeffrey Altman <jaltman@mit.edu>
* Fix libpath for krbcc32.lib (only affects KRB5_KFW_COMPILE builds) ticket: new target_version: 1.3.2 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16065 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows')
-rw-r--r--src/windows/gss/ChangeLog4
-rw-r--r--src/windows/gss/Makefile.in6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog
index 386bc405c3..64d57dd7dd 100644
--- a/src/windows/gss/ChangeLog
+++ b/src/windows/gss/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-12 Jeffrey Altman <jaltman@mit.edu>
+
+ * Fix libpath for krbcc32.lib (only affects KRB5_KFW_COMPILE builds)
+
2004-02-11 Jeffrey Altman <jaltman@mit.edu>
* gss-misc.h: Add file. Copy from src/appl/gss-sample/
diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in
index 1c4baa1af3..9c87f185d4 100644
--- a/src/windows/gss/Makefile.in
+++ b/src/windows/gss/Makefile.in
@@ -11,7 +11,7 @@ BUILDTOP=..\..
!if defined(KRB5_KFW_COMPILE)
KFWINC= /I$(BUILDTOP)\..\..\krbcc\include
-KFWLIB= krbcc32.lib
+KFWLIB= $(BUILDTOP)\..\..\..\..\target\lib\$(CPU)\$(OUTPRE_DBG)\krbcc32.lib
!endif
LOCALINCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 $(KFWINC)
@@ -22,14 +22,14 @@ RCFLAGS = $(RFLAGS) -D_WIN32 -DGSS_APP
##### Linker
LINK = link
LIBS = $(GLIB) $(CLIB) $(WLIB)
-SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib comctl32.lib $(KFWLIB)
+SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib comctl32.lib
LFLAGS = /nologo $(LOPTS)
all:: Makefile $(OUTPRE)gss.exe
$(OUTPRE)gss.exe: gss.def $(OBJS) $(XOBJS) $(LIBS)
$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \
- $(LIBS) $(SYSLIBS)
+ $(LIBS) $(SYSLIBS) $(KFWLIB)
$(OBJS) $(XOBJS): gss.h