Improve Windows Build System By Using MT-safe Versions of Libraries

[openafs.git] / src / tbutc / NTMakefile

diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile
index 815530a..bd04c80 100644 (file)
--- a/src/tbutc/NTMakefile
+++ b/src/tbutc/NTMakefile
@@ -29,7 +29,7 @@ FSINT   =..\fsint
 BUTM    =..\butm
 BUTC    =..\butc
 BUCOORD = ..\bucoord
-VOLSER  = ..\volser
+VOLSER  = ..\tvolser
 
 BUCOORDOBJS = $(OUT)\ubik_db_if.obj \
     $(OUT)\$(BUCOORD)\volstub.obj \
@@ -37,16 +37,6 @@ BUCOORDOBJS = $(OUT)\ubik_db_if.obj \
        $(OUT)\$(BUCOORD)\status.obj \
     $(OUT)\$(BUCOORD)\bucoord_errs.obj
 
-VOLSERLIBOBJ = $(OUT)\$(VOLSER)\volint.cs.obj  \
-               $(OUT)\vsprocs.obj \
-               $(OUT)\$(VOLSER)\vsutils.obj \
-               $(OUT)\$(VOLSER)\lockprocs.obj  \
-               $(OUT)\$(VOLSER)\volint.xdr.obj \
-               $(OUT)\$(VOLSER)\volerr.obj  \
-               $(OUT)\$(VOLSER)\volint.ss.obj  \
-               $(OUT)\AFS_component_version_number.obj 
-VOLSERLIBS  = $(OUT)\afstvolser.lib
-
 LWPOBJS     = $(OUT)\lock.obj
 
 BUTMOBJS    = $(OUT)\file_tm.obj \
@@ -72,14 +62,14 @@ BUTCRES = $(OUT)\butc.res
 BUTCINCLUDE= -I. -I$(DESTDIR)\include -I$(XBSADIR)
 BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
             $(DESTDIR)\lib\afs\afsbubasics.lib \
-            $(VOLSERLIBS) \
+            $(DESTDIR)\lib\afs\afstvolser.lib \
              $(BUTMLIBS) \
-            $(DESTDIR)\lib\afs\afsvldb.lib \
+            $(DESTDIR)\lib\afs\mtafsvldb.lib \
             $(DESTDIR)\lib\afs\afskauth.lib \
             $(DESTDIR)\lib\afs\afsauth.lib \
             $(DESTDIR)\lib\afsrpc.lib \
              $(DESTDIR)\lib\afsrxkad.lib \
-            $(DESTDIR)\lib\afsubik.lib \
+            $(DESTDIR)\lib\afs\mtafsubik.lib \
              $(DESTDIR)\lib\afs\afsutil.lib \
              $(DESTDIR)\lib\afs\afsusd.lib \
             $(DESTDIR)\lib\afs\afspioctl.lib \
@@ -94,19 +84,8 @@ BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
        $(DESTDIR)\lib\afspthread.lib \
 !ENDIF
             $(DESTDIR)\lib\afsdes.lib \
-            $(DESTDIR)\lib\cm_dns.obj \
-             $(DESTDIR)\lib\cm_nls.obj
-
+            $(DESTDIR)\lib\libafsconf.lib
 
-#      $(DESTDIR)\lib\afsauthent.lib \
-#      $(DESTDIR)\lib\afsrpc.lib \
-#      $(DESTDIR)\lib\afs\afscmd.lib \
-#      $(DESTDIR)\lib\afs\afsaudit.lib \
-#      $(DESTDIR)\lib/afs/afscom_err.lib \
-#      $(DESTDIR)\lib\afs\afsreg.lib \
-#      $(DESTDIR)\lib\afs\afsprocmgmt.lib \
-#      $(DESTDIR)\lib\afs\afseventlog.lib \
-#      $(DESTDIR)\lib\pthread.lib
 
 # rm $(OUT)\tcstatus.obj
 # nmake /nologo /f ntmakefile install
@@ -158,16 +137,6 @@ $(OUT)\butc_xbsa.obj: $(BUTC)/butc_xbsa.c
 $(OUT)\ubik_db_if.obj: $(BUCOORD)/ubik_db_if.c
        $(C2OBJ) -I$(BUCOORD) $**
 
-#----------------------------------------------- VOLSER
-# Build the afstvolser.lib library here. The file compiled
-# for is is vsprocs.c. The rest are from the VOLSER dir.
-
-$(OUT)\afstvolser.lib: $(VOLSERLIBOBJ)
-       $(LIBARCH)
-
-$(OUT)\vsprocs.obj: $(VOLSER)/vsprocs.c
-       $(C2OBJ) $**
-
 #----------------------------------------------- LWP
 
 $(OUT)\lock.obj: $(LWP)/lock.c