kauth: permit kauth/test to build on Windows (again)

Change-Id: I28f7bc93e189a2fcf3651552e00b4214bb6ec799
Reviewed-on: http://gerrit.openafs.org/5473
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/auth/test/NTMakefile b/src/auth/test/NTMakefile
index cb88d03d0eaaf56a9a414b8d3278fb7045f69bc1..b1fa46ca01ca78c038b43a6cfbc8d39d469ae80b 100644 (file)
--- a/src/auth/test/NTMakefile
+++ b/src/auth/test/NTMakefile
@@ -16,12 +16,14 @@ CELL_EXEOBJS =\
        $(OUT)\testcellconf.obj
 
 CELL_EXELIBS =\
+       $(DESTDIR)\lib\afs\afsutil.lib \
        $(DESTDIR)\lib\afs\afsauth.lib \
        $(DESTDIR)\lib\afsrx.lib \
        $(DESTDIR)\lib\afslwp.lib \
-       $(DESTDIR)\lib\afs\afsutil.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
-        $(DESTDIR)\lib\libafsconf.lib
+        $(DESTDIR)\lib\libafsconf.lib \
+        $(DESTDIR)\lib\opr.lib \
+        $(DESTDIR)\lib\afsroken.lib
 
 $(CELL_EXEFILE): $(CELL_EXEOBJS)  $(CELL_EXELIBS)
        $(EXECONLINK) dnsapi.lib shell32.lib
@@ -39,11 +41,15 @@ KTC_EXEOBJS =\
 KTC_EXELIBS =\
        $(DESTDIR)\lib\afs\afsutil.lib \
        $(DESTDIR)\lib\afs\afsauth.lib \
+       $(DESTDIR)\lib\afsrx.lib \
+       $(DESTDIR)\lib\afslwp.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
-       $(DESTDIR)\lib\afs\afspioctl.lib
+       $(DESTDIR)\lib\afs\afspioctl.lib \
+        $(DESTDIR)\lib\opr.lib \
+        $(DESTDIR)\lib\afsroken.lib
 
-$(KTC_EXEFILE): $(KTC_EXEOBJS)  $(KTC_EXELIBS) $(HEIMDEPS)
-       $(EXECONLINK) dnsapi.lib shell32.lib mpr.lib $(HEIMLINKOPTS)
+$(KTC_EXEFILE): $(KTC_EXEOBJS)  $(KTC_EXELIBS)
+       $(EXECONLINK) dnsapi.lib shell32.lib mpr.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
         $(CODESIGN_USERLAND)

diff --git a/src/auth/test/ktctest.c b/src/auth/test/ktctest.c
index 72c461a61a4f880b5bfc3ad610c97d7566ffdd32..80508a8f478365feac117e9d97f13dbbda117196 100644 (file)
--- a/src/auth/test/ktctest.c
+++ b/src/auth/test/ktctest.c
@@ -9,15 +9,15 @@
 
 /* Test of the ktc_*Token() routines */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <errno.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
-
-
 #include <afs/stds.h>
 #include <afs/afsutil.h>
 #include <afs/auth.h>