Windows: Build against KerbCompatSDK instead of KFW

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

diff --git a/src/WINNT/netidmgr_plugin/NTMakefile b/src/WINNT/netidmgr_plugin/NTMakefile
index 8be7c4f..6985964 100644 (file)
--- a/src/WINNT/netidmgr_plugin/NTMakefile
+++ b/src/WINNT/netidmgr_plugin/NTMakefile
@@ -47,13 +47,9 @@ INCFILEDIR = $(DESTDIR)\include\WINNT
 
 LIBFILEDIR = $(DESTDIR)\lib
 
-KFWINCDIR = ..\kfw\inc
-
-KFWLIBDIR = ..\kfw\lib\$(CPU)
-
 # Build environment
 
-kfwincflags=-I$(KFWINCDIR)\krb5\KerberosIV -I$(KFWINCDIR)\loadfuncs -I$(KFWINCDIR)\krb5 -I$(KFWINCDIR)\netidmgr -I$(KFWINCDIR)
+kfwincflags=-I$(HEIMDALSDKDIR)\inc -I$(HEIMDALSDKDIR)\inc\krb5 -I..\kfw\inc\netidmgr
 afsincflags=-I$(DESTDIR)\include -I$(DESTDIR)\include\afs -I$(DESTDIR)\include\rx
 
 incflags=$(kfwincflags) $(afsincflags) -I.
@@ -98,17 +94,16 @@ OBJFILES=                           \
 
 !if "$(CPU)" == "AMD64"
 LIBFILES=                              \
-       $(KFWLIBDIR)\nidmgr64.lib
+       $(AFSROOT)\src\WINNT\kfw\lib\$(CPU)\nidmgr64.lib
 !else
 LIBFILES=                              \
-       $(KFWLIBDIR)\nidmgr32.lib
+       $(AFSROOT)\src\WINNT\kfw\lib\$(CPU)\nidmgr32.lib
 !endif
 
 SDKLIBFILES=                           \
        $(DESTDIR)\lib\afsauthent.lib   \
        $(DESTDIR)\lib\libafsconf.lib   \
         $(DESTDIR)\lib\afs\mtafsutil.lib\
-       $(KFWLIBDIR)\loadfuncs.lib      \
        htmlhelp.lib                    \
        shell32.lib                     \
        comctl32.lib                    \
@@ -116,6 +111,8 @@ SDKLIBFILES=                                \
        shlwapi.lib                     \
        psapi.lib
 
+DELAYOPT=/DELAYLOAD:advapi32.dll /DELAYLOAD:secur32.dll /DELAYLOAD:psapi.dll
+
 VERRESFILE=$(OUT)\version.res
 
 $(OUT)\afsfuncs.obj: afsfuncs.c
@@ -151,8 +148,8 @@ $(OUT)\dynimport.obj: dynimport.c
 $(OUT)\krb5common.obj: krb5common.c
        $(PC2OBJ)
 
-$(DLLFILE): $(OBJFILES) $(VERRESFILE)
-       $(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES)
+$(DLLFILE): $(OBJFILES) $(VERRESFILE) $(HEIMDEPS)
+       $(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES) $(DELAYOPT) $(HEIMLINKOPTS)
        $(_VC_MANIFEST_EMBED_DLL)
        $(_VC_MANIFEST_CLEAN)
         $(CODESIGN_USERLAND)