rx: Remove RX_CALL_BUSY

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

diff --git a/src/WINNT/pthread/NTMakefile b/src/WINNT/pthread/NTMakefile
index 6ae0b8e..8030ab5 100644 (file)
--- a/src/WINNT/pthread/NTMakefile
+++ b/src/WINNT/pthread/NTMakefile
@@ -1,14 +1,14 @@
 # Copyright 2000, International Business Machines Corporation 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
 
+RELDIR=WINNT\pthread
 !INCLUDE ..\..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\..\config\NTMakefile.version
 
-
 ############################################################################
 # Export header files
 
@@ -16,39 +16,36 @@ LIBINCLUDES = \
        $(DESTDIR)\include\pthread.h
 
 ############################################################################
-# Build standard pthread.dll
+# Build standard afspthread.dll
 
-PTHR_DLLFILE = $(DESTDIR)\lib\pthread.dll
+PTHR_DLLFILE = $(DESTDIR)\lib\afspthread.dll
 
-PTHR_DLLOBJS = \
-       pthread.obj \
-       pthread.res
+UTIL = ..\..\util
 
-$(PTHR_DLLFILE): $(PTHR_DLLOBJS)
-       $(DLLCONLINK) /DEF:pthread.def
-       $(DLLPREP)
+$(OUT)\pthread.res: pthread.rc AFS_component_version_number.h
+       $(RC) /fo$*.res $(*F).rc
 
-############################################################################
-# Build Windows 95 version of pthread.dll
+PTHR_DLLOBJS = \
+       $(OUT)\pthread.obj \
+       $(OUT)\pthread.res
 
-PTHR95_DLLFILE = $(DESTDIR)\lib\win95\pthread.dll
+UTILOBJS = \
+       $(OUT)\pthread_glock.obj
 
-PTHR95_DLLOBJS = \
-       pthread_95.obj \
-       pthread95.res
+$(UTILOBJS): $(UTIL)\$$(@B).c
+       $(C2OBJ) -I$(UTIL) -DAFS_PTHREAD_ENV $**
 
-$(PTHR95_DLLFILE): $(PTHR95_DLLOBJS)
+$(PTHR_DLLFILE): $(PTHR_DLLOBJS) $(UTILOBJS)
        $(DLLCONLINK) /DEF:pthread.def
+        $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
+       $(MAKECYGLIB) --input-def pthread.def
 
-pthread_95.obj: pthread.c
-       $(C2OBJ) pthread.c -DAFS_WIN95_ENV /Fopthread_95.obj
-
+install: $(PTHR_DLLFILE) $(LIBINCLUDES)
 
-install: $(PTHR_DLLFILE) $(PTHR95_DLLFILE) $(LIBINCLUDES)
+clean::
 
-pthread.res: pthread.rc AFS_component_version_number.h
-       $(RC) $*.rc
+mkdir:
 
-pthread95.res: pthread95.rc AFS_component_version_number.h
-       $(RC) $*.rc