Windows: Use mtafsutil library when linking with pthreads

Use the multi-threaded version of the util library in a few places
that are linking with pthreads but use the standard version.

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

diff --git a/src/WINNT/pthread/test/NTMakefile b/src/WINNT/pthread/test/NTMakefile
index 8aad6c91aaf7b16e2a93af142f9ec25baba29e2b..2f14f55c0392edb500023ad0c8b4be9c12ed5103 100644 (file)
--- a/src/WINNT/pthread/test/NTMakefile
+++ b/src/WINNT/pthread/test/NTMakefile
@@ -10,20 +10,24 @@ RELDIR=WINNT\pthread\test
 
 test tests: ptest.exe tsd.exe native.exe
 
+EXELIBDIR = $(DESTDIR)\lib
 
-$(OUT)\ptest.exe: $(OUT)\ptest.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib
+EXELIBS =\
+        $(EXELIBDIR)/afspthread.lib $(EXELIBDIR)/afs/mtafsutil.lib
+
+$(OUT)\ptest.exe: $(OUT)\ptest.obj
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
         $(CODESIGN_USERLAND)
         $(SYMSTORE_IMPORT)
 
-$(OUT)\tsd.exe: $(OUT)\tsd.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib
+$(OUT)\tsd.exe: $(OUT)\tsd.obj $(EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
         $(CODESIGN_USERLAND)
         $(SYMSTORE_IMPORT)
 
-$(OUT)\native.exe: $(OUT)\native.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib
+$(OUT)\native.exe: $(OUT)\native.obj $(EXELIBS)
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
         $(CODESIGN_USERLAND)

diff --git a/src/libadmin/client/NTMakefile b/src/libadmin/client/NTMakefile
index 2391de361bed768136ffaab6c7a1b18222a3e499..26cf5f768ec21d8f7248143c3b56c814fc1487b4 100644 (file)
--- a/src/libadmin/client/NTMakefile
+++ b/src/libadmin/client/NTMakefile
@@ -27,7 +27,7 @@ DLLLIBS =\
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\afsrpc.lib \
        $(DESTDIR)\lib\afspthread.lib \
-        $(DESTDIR)\lib\afs\afsutil.lib \
+        $(DESTDIR)\lib\afs\mtafsutil.lib \
        $(DESTDIR)\lib\opr.lib \
         $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/libadmin/kas/NTMakefile b/src/libadmin/kas/NTMakefile
index 85d340ba4665f64aac2c2253f5cecccf5527fe3c..db1d627b47730e619c31f3bea349e214ec59c3d6 100644 (file)
--- a/src/libadmin/kas/NTMakefile
+++ b/src/libadmin/kas/NTMakefile
@@ -36,7 +36,7 @@ DLLLIBS =\
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\afsrpc.lib \
        $(DESTDIR)\lib\afspthread.lib \
-       $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\afs\mtafsutil.lib \
        $(DESTDIR)\lib\opr.lib \
         $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/libadmin/pts/NTMakefile b/src/libadmin/pts/NTMakefile
index 662b8b28994ba9f8945303d4d15cd6966275bf34..640246f49b864992db2b320409e477f726c52da5 100644 (file)
--- a/src/libadmin/pts/NTMakefile
+++ b/src/libadmin/pts/NTMakefile
@@ -39,7 +39,7 @@ DLLLIBS =\
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\afsrpc.lib \
        $(DESTDIR)\lib\afspthread.lib \
-       $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\afs\mtafsutil.lib \
        $(DESTDIR)\lib\opr.lib \
         $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/libadmin/vos/NTMakefile b/src/libadmin/vos/NTMakefile
index 2c6fb3f553f4558e6c85c4a02cfc42d79f80b85b..d87fdf4da57f77e2c1efcab96389e0b0835673e5 100644 (file)
--- a/src/libadmin/vos/NTMakefile
+++ b/src/libadmin/vos/NTMakefile
@@ -60,7 +60,7 @@ DLLLIBS =\
        $(DESTDIR)\lib\afs\afsadminutil.lib \
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\afsrpc.lib \
-       $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\afs\mtafsutil.lib \
        $(DESTDIR)\lib\opr.lib \
         $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/procmgmt/NTMakefile b/src/procmgmt/NTMakefile
index 610a4d7e2646243d1ab637699650d431be2391d5..a93c8643e812a8b15230169df8f4cb4ca6463801 100644 (file)
--- a/src/procmgmt/NTMakefile
+++ b/src/procmgmt/NTMakefile
@@ -31,7 +31,7 @@ DLLOBJS =\
 
 DLLLIBS =\
        $(DESTDIR)\lib\afspthread.lib \
-       $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\afs\mtafsutil.lib \
         $(DESTDIR)\lib\afsroken.lib
 
 $(DLLFILE): $(DLLOBJS) $(DLLRES) $(DLLLIBS)
@@ -84,4 +84,4 @@ install_headers: $(INCFILES)
 install: install_headers $(DLLFILE) $(CL_KILL_EXEFILE)
 
 clean::
-       $(DEL) $(INCFILES)
\ No newline at end of file
+       $(DEL) $(INCFILES)