Windows: Build libafsauthent.dll against mtafsubik.lib

Instead of building a private copy of the ubik objects, link
against mtafsubik.lib.

Change-Id: Ic72e0ea963ddb870d082f7a3746f978ba785bbbc
Reviewed-on: http://gerrit.openafs.org/9302
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>

diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile
index 2296d8c859c9e210cf2f57b226421782218e70b2..796415b0a33c274c70fd4a812ab9cf60b4d7046c 100644 (file)
--- a/src/libafsauthent/NTMakefile
+++ b/src/libafsauthent/NTMakefile
@@ -18,7 +18,6 @@ RELDIR=libafsauthent
 AUDIT = ..\audit
 AUTH = ..\auth
 KAUTH = ..\kauth
-UBIK = ..\ubik
 RXKAD = ..\rxkad
 PTSERVER = ..\ptserver
 SYS = ..\sys
@@ -60,13 +59,6 @@ KAUTHOBJS = \
        $(OUT)\user_nt.obj \
         $(OUT)\katoken.obj
 
-UBIKOBJS = \
-       $(OUT)\uinit.obj \
-       $(OUT)\ubikclient.obj \
-       $(OUT)\uerrors.obj \
-       $(OUT)\ubik_int.cs.obj \
-       $(OUT)\ubik_int.xdr.obj
-
 RXKADOBJS = \
        $(OUT)\rxkad_errs.obj
 
@@ -87,7 +79,6 @@ WINNTAFSDOBJS =\
 DLLOBJS =\
        $(AUTHOBJS) \
        $(KAUTHOBJS) \
-       $(UBIKOBJS) \
        $(RXKADOBJS) \
        $(PTSERVEROBJS) \
        $(SYSOBJS) \
@@ -104,9 +95,6 @@ $(AUTHOBJS): $(AUTH)\$$(@B).c
 $(KAUTHOBJS): $(KAUTH)\$$(@B).c
        $(C2OBJ) -I$(KAUTH) $**
 
-$(UBIKOBJS): $(UBIK)\$$(@B).c
-       $(C2OBJ) -I$(UBIK) $**
-
 $(RXKADOBJS): $(RXKAD)\$$(@B).c
        $(C2OBJ) -I$(RXKAD) $**
 
@@ -123,6 +111,7 @@ $(SYSOBJS): $(SYS)\$$(@B).c
        $(C2OBJ) -I$(SYS) $**
 
 DLLLIBS =\
+        $(DESTDIR)\lib\afs\mtafsubik.lib \
        $(DESTDIR)\lib\afspthread.lib \
        $(DESTDIR)\lib\afsrpc.lib \
        $(DESTDIR)\lib\afs\mtafsutil.lib \