ubik: build all files for pthread version

Build all files for pthreads from the ubik directory.
No longer require src/tubik/NTMakefile.
Add missing library to tbutc linkage requirements.

Change-Id: If517ce528e5dde9b600824897e1304949b2c2719
Reviewed-on: http://gerrit.openafs.org/4150
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile
index 5f71aac..3d362c6 100644 (file)
--- a/src/tbutc/NTMakefile
+++ b/src/tbutc/NTMakefile
@@ -34,7 +34,7 @@ VOLSER  = ..\tvolser
 BUCOORDOBJS = $(OUT)\ubik_db_if.obj \
     $(OUT)\$(BUCOORD)\volstub.obj \
     $(OUT)\$(BUCOORD)\dlq.obj \
-       $(OUT)\$(BUCOORD)\status.obj \
+    $(OUT)\$(BUCOORD)\status.obj \
     $(OUT)\$(BUCOORD)\bucoord_errs.obj
 
 LWPOBJS     = $(OUT)\lock.obj $(OUT)\waitkey.obj
@@ -50,7 +50,7 @@ BUTCOBJS   = $(OUT)\dbentries.obj \
          $(OUT)\tcmain.obj \
          $(OUT)\list.obj \
          $(OUT)\recoverDb.obj \
-            $(OUT)\tcudbprocs.obj \
+        $(OUT)\tcudbprocs.obj \
          $(OUT)\dump.obj \
          $(OUT)\tcstatus.obj \
          $(OUT)\butc_xbsa.obj \
@@ -78,11 +78,8 @@ BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
             $(DESTDIR)\lib\afs\afsreg.lib \
             $(DESTDIR)\lib\afs\afsprocmgmt.lib \
              $(DESTDIR)\lib\afs\afseventlog.lib \
-!IF (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" ))
-       $(DESTDIR)\lib\win95\afspthread.lib \
-!ELSE
-       $(DESTDIR)\lib\afspthread.lib \
-!ENDIF
+            $(DESTDIR)\lib\afspthread.lib \
+             $(DESTDIR)\lib\afsauthent.lib \
             $(DESTDIR)\lib\libafsconf.lib \
             $(DESTDIR)\lib\afshcrypto.lib \
             $(DESTDIR)\lib\afsroken.lib

diff --git a/src/tubik/NTMakefile b/src/tubik/NTMakefile
deleted file mode 100644 (file)
index c7d11ff..0000000
--- a/src/tubik/NTMakefile
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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=tubik
-!INCLUDE ..\config\NTMakefile.$(SYS_NAME)
-!INCLUDE ..\config\NTMakefile.version
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DAFS_PTHREAD_ENV
-
-SRC_DIR = ..\ubik
-
-############################################################################
-# Install header files
-
-INCFILEDIR = $(DESTDIR)\include
-
-INCFILES =\
-       $(INCFILEDIR)\ubik.h \
-       $(INCFILEDIR)\ubik_int.h
-
-install_headers: $(INCFILES)
-
-############################################################################
-# build mtafsubik.lib
-
-MT_LIBFILE = $(DESTDIR)\lib\afs\mtafsubik.lib
-
-MT_LIBOBJS =\
-       $(OUT)\disk.obj \
-       $(OUT)\remote.obj \
-       $(OUT)\beacon.obj \
-       $(OUT)\recovery.obj \
-       $(OUT)\ubik.obj \
-       $(OUT)\uinit.obj \
-       $(OUT)\vote.obj \
-       $(OUT)\lock.obj \
-       $(OUT)\phys.obj \
-       $(OUT)\ubik_int.cs.obj \
-       $(OUT)\ubik_int.ss.obj \
-       $(OUT)\ubik_int.xdr.obj \
-       $(OUT)\ubikcmd.obj \
-       $(OUT)\ubikclient.obj \
-       $(OUT)\uerrors.obj      \
-       $(OUT)\AFS_component_version_number.obj
-
-$(MT_LIBOBJS): $(SRC_DIR)\$$(@B).c
-        $(C2OBJ) -I$(SRC_DIR) $**
-
-$(MT_LIBFILE): $(MT_LIBOBJS)
-       $(LIBARCH)
-
-############################################################################
-# Definitions for building a EXE.
-
-RS_UDBG_EXEFILE = $(DESTDIR)\root.server\usr\afs\bin\udebug.exe
-CL_UDBG_EXEFILE = $(DESTDIR)\bin\udebug.exe
-
-UDBG_EXEOBJS =\
-       $(OUT)\udebug.obj
-
-UDBG_EXERES =\
-       $(OUT)\udebug.res
-
-$(UDBG_EXEOBJS): $(SRC_DIR)\$$(@B).c
-        $(C2OBJ) -I$(SRC_DIR) $**
-
-UDBG_EXELIBS =\
-       $(DESTDIR)\lib\afs\mtafsubik.lib \
-       $(DESTDIR)\lib\afs\afsreg.lib \
-       $(DESTDIR)\lib\afsrpc.lib \
-       $(DESTDIR)\lib\afs\afscom_err.lib \
-       $(DESTDIR)\lib\afs\afscmd.lib \
-       $(DESTDIR)\lib\afs\mtafsutil.lib
-
-$(RS_UDBG_EXEFILE): $(UDBG_EXEOBJS) $(UDBG_EXERES) $(UDBG_EXELIBS)
-       $(EXECONLINK) iphlpapi.lib shell32.lib
-        $(_VC_MANIFEST_EMBED_EXE)
-       $(EXEPREP)
-        $(CODESIGN_USERLAND)
-        $(SYMSTORE_IMPORT)
-
-$(CL_UDBG_EXEFILE): $(RS_UDBG_EXEFILE)
-       $(COPY) $** $@
-
-############################################################################
-# generate versioninfo resources
-
-$(OUT)\udebug.res: AFS_component_version_number.h
-#      $(RC) $*.rc
-
-############################################################################
-# Install target; primary makefile target
-
-install: $(MT_LIBFILE) $(CL_UDBG_EXEFILE)
-
-clean::
-        -$(DEL) $(MT_LIBFILE)
-        -$(DEL) $(CL_UDBG_EXEFILE)
-
-mkdir:

diff --git a/src/ubik/NTMakefile b/src/ubik/NTMakefile
index c918451..cc1ee69 100644 (file)
--- a/src/ubik/NTMakefile
+++ b/src/ubik/NTMakefile
@@ -53,23 +53,50 @@ $(LIBFILE): $(LIBOBJS)
 MT_LIBFILE = $(DESTDIR)\lib\afs\mtafsubik.lib
 
 MT_LIBOBJS =\
-       $(OUT)\disk.obj \
-       $(OUT)\remote.obj \
-       $(OUT)\beacon.obj \
-       $(OUT)\recovery.obj \
-       $(OUT)\ubik.obj \
-       $(OUT)\uinit.obj \
-       $(OUT)\vote.obj \
-       $(OUT)\lock.obj \
-       $(OUT)\phys.obj \
+       $(OUT)\disk_mt.obj \
+       $(OUT)\remote_mt.obj \
+       $(OUT)\beacon_mt.obj \
+       $(OUT)\recovery_mt.obj \
+       $(OUT)\ubik_mt.obj \
+       $(OUT)\uinit_mt.obj \
+       $(OUT)\vote_mt.obj \
+       $(OUT)\lock_mt.obj \
+       $(OUT)\phys_mt.obj \
        $(OUT)\ubik_int_mt.cs.obj \
        $(OUT)\ubik_int_mt.ss.obj \
        $(OUT)\ubik_int_mt.xdr.obj \
-       $(OUT)\ubikcmd.obj \
-       $(OUT)\ubikclient.obj \
+       $(OUT)\ubikcmd_mt.obj \
+       $(OUT)\ubikclient_mt.obj \
        $(OUT)\uerrors_mt.obj   \
        $(OUT)\AFS_component_version_number.obj
 
+$(OUT)\disk_mt.obj:disk.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
+$(OUT)\remote_mt.obj:remote.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
+$(OUT)\beacon_mt.obj:beacon.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
+$(OUT)\recovery_mt.obj:recovery.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
+$(OUT)\ubik_mt.obj:ubik.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
+$(OUT)\uinit_mt.obj:uinit.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
+$(OUT)\vote_mt.obj:vote.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
+$(OUT)\lock_mt.obj:lock.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
+$(OUT)\phys_mt.obj:phys.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
 $(OUT)\uerrors_mt.obj:uerrors.c
        $(C2OBJ) $** -DAFS_PTHREAD_ENV
 
@@ -82,6 +109,12 @@ $(OUT)\ubik_int_mt.ss.obj:ubik_int.ss.c
 $(OUT)\ubik_int_mt.xdr.obj:ubik_int.xdr.c
        $(C2OBJ) $** -DAFS_PTHREAD_ENV
 
+$(OUT)\ubikcmd_mt.obj:ubikcmd.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
+$(OUT)\ubikclient_mt.obj:ubikclient.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
 $(MT_LIBFILE): $(MT_LIBOBJS)  
        $(LIBARCH) 
 
@@ -149,11 +182,8 @@ uerrors.c ubik.h: uerrors.et ubik.p.h
 ############################################################################
 # Install target; primary makefile target
 
-install9X: $(INCFILES) $(LIBFILE)
-
 install: $(INCFILES) $(LIBFILE) $(MT_LIBFILE) $(CL_UDBG_EXEFILE)
 
-
 clean::
        $(DEL) ubik_int.ss.c ubik_int.cs.c ubik_int.xdr.c 
        $(DEL) uerrors.c $(INCFILES)