rx: Remove RX_CALL_BUSY

[openafs.git] / src / WINNT / aklog / NTMakefile

diff --git a/src/WINNT/aklog/NTMakefile b/src/WINNT/aklog/NTMakefile
index fedc318..c8d4293 100644 (file)
--- a/src/WINNT/aklog/NTMakefile
+++ b/src/WINNT/aklog/NTMakefile
@@ -1,12 +1,12 @@
 # Copyright 2004, OpenAFS.ORG and others.
 # All Rights Reserved.
-# 
+#
 # This software has been released under the terms of the IBM Public
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
 # include the primary makefile
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES)  -DHAVE_KRB5_CREDS_KEYBLOCK=1
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES)  -DHAVE_KRB5_CREDS_KEYBLOCK=1 -I$(HEIMINC)
 RELDIR=WINNT\aklog
 !INCLUDE ..\..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\..\config\NTMakefile.version
@@ -29,52 +29,39 @@ $(PTERROBJS): $(AFSROOT)\src\ptserver\pterror.c
 
 ASETKEY = $(DESTDIR)\root.server\usr\afs\bin\asetkey.exe
 
+UNIX = ..\..\aklog
+
 ASETKEYOBJS = \
        $(OUT)\asetkey.obj
 
 EXELIBS = \
-       $(DESTDIR)\lib\afs\afspioctl.lib \
+        $(DESTDIR)\lib\afsrpc.lib \
         $(DESTDIR)\lib\afsauthent.lib \
-        $(DESTDIR)\lib\afs\afskauth.lib \
-        $(DESTDIR)\lib\afs\afscom_err.lib \
-        $(DESTDIR)\lib\afs\afsutil.lib \
-       $(DESTDIR)\lib\afsroken.lib
-
-!IF "$(CPU)" == "IA64" || "$(CPU)" == "AMD64" || "$(CPU)" == "ALPHA64"
-OTHERLIBS = \
-    ..\kfw\lib\$(CPU)\krb5_64.lib \
-    ..\kfw\lib\$(CPU)\comerr64.lib \
-    dnsapi.lib mpr.lib delayimp.lib
-LINKOPTS = /DELAYLOAD:krb5_64.dll /DELAYLOAD:comerr64.dll
-!else
-OTHERLIBS = \
-    ..\kfw\lib\$(CPU)\krbv4w32.lib \
-    ..\kfw\lib\$(CPU)\krb5_32.lib \
-    ..\kfw\lib\$(CPU)\comerr32.lib \
-    dnsapi.lib mpr.lib delayimp.lib
-LINKOPTS = /DELAYLOAD:krbv4w32.dll /DELAYLOAD:krb5_32.dll /DELAYLOAD:comerr32.dll
-!endif
-afscflags = -I..\kfw\inc\krb5 -I..\kfw\inc\krb4 $(afscflags)
+       $(DESTDIR)\lib\opr.lib \
+       $(DESTDIR)\lib\afsroken.lib \
+       $(DESTDIR)\lib\afsrpc.lib
+
+OTHERLIBS = dnsapi.lib mpr.lib
 
 $(AKLOGOBJS): $$(@B).c
        $(C2OBJ) $**
 
-$(ASETKEYOBJS): $$(@B).c
-       $(C2OBJ) $**
+$(ASETKEYOBJS): $(UNIX)\$$(@B).c
+       $(C2OBJ) $** -I$(UNIX)
 
 ############################################################################
 
-$(AKLOG) : $(AKLOGOBJS) $(PTERROBJS) $(EXELIBS) $(OUT)\aklog.res
-       $(EXECONLINK) $(EXELIBS) $(OTHERLIBS) $(LINKOPTS)
+$(AKLOG) : $(AKLOGOBJS) $(PTERROBJS) $(EXELIBS) $(OUT)\aklog.res $(HEIMDEPS)
+       $(EXECONLINK) $(EXELIBS) $(OTHERLIBS) $(HEIMLINKOPTS)
         $(_VC_MANIFEST_EMBED_EXE)
-       $(EXEPREP) 
+       $(EXEPREP)
         $(CODESIGN_USERLAND)
         $(SYMSTORE_IMPORT)
 
-$(ASETKEY) : $(ASETKEYOBJS) $(EXELIBS) $(OUT)\asetkey.res
-       $(EXECONLINK) $(EXELIBS) $(OTHERLIBS) $(LINKOPTS)
+$(ASETKEY) : $(ASETKEYOBJS) $(EXELIBS) $(OUT)\asetkey.res $(HEIMDEPS)
+       $(EXECONLINK) $(EXELIBS) $(OTHERLIBS) $(HEIMLINKOPTS)
         $(_VC_MANIFEST_EMBED_EXE)
-       $(EXEPREP) 
+       $(EXEPREP)
         $(CODESIGN_USERLAND)
         $(SYMSTORE_IMPORT)