From: Marc Dionne <marc.dionne@your-file-system.com>
Date: Fri, 3 May 2013 13:11:50 +0000 (-0400)
Subject: Windows: Use mtafsutil library when linking with pthreads
X-Git-Tag: upstream/1.8.0_pre1^2~1188
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b5550d1877ceb1660d8058e8bc3609d6d85fbb41;p=packages%2Fo%2Fopenafs.git

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 8aad6c91a..2f14f55c0 100644
--- 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 2391de361..26cf5f768 100644
--- 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 85d340ba4..db1d627b4 100644
--- 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 662b8b289..640246f49 100644
--- 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 2c6fb3f55..d87fdf4da 100644
--- 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 610a4d7e2..a93c8643e 100644
--- 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)