Improve Windows Build System By Using MT-safe Versions of Libraries
[openafs.git] / src / tbutc / NTMakefile
index 52bbe47..bd04c80 100644 (file)
@@ -5,8 +5,9 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-AFSDEV_AUXCDEFINES = -DAFS_PTHREAD_ENV -DRXDEBUG
+AFSDEV_AUXCDEFINES = -DAFS_PTHREAD_ENV -DRXDEBUG -DNOGDI -DWIN32_LEAN_AND_MEAN
 
+RELDIR=tbutc
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\config\NTMakefile.version
 
@@ -28,40 +29,47 @@ FSINT   =..\fsint
 BUTM    =..\butm
 BUTC    =..\butc
 BUCOORD = ..\bucoord
-VOLSER  = ..\volser
+VOLSER  = ..\tvolser
 
-BUCOORDOBJS = ubik_db_if.obj $(BUCOORD)\volstub.obj $(BUCOORD)\dlq.obj \
-                            $(BUCOORD)\status.obj $(BUCOORD)\bucoord_errs.obj
+BUCOORDOBJS = $(OUT)\ubik_db_if.obj \
+    $(OUT)\$(BUCOORD)\volstub.obj \
+    $(OUT)\$(BUCOORD)\dlq.obj \
+       $(OUT)\$(BUCOORD)\status.obj \
+    $(OUT)\$(BUCOORD)\bucoord_errs.obj
 
-VOLSERLIBOBJ = $(VOLSER)\volint.cs.obj  vsprocs.obj              $(VOLSER)\vsutils.obj \
-               $(VOLSER)\lockprocs.obj  $(VOLSER)\volint.xdr.obj $(VOLSER)\volerr.obj  \
-               $(VOLSER)\volint.ss.obj  AFS_component_version_number.obj 
-VOLSERLIBS  = afstvolser.lib
+LWPOBJS     = $(OUT)\lock.obj
 
-LWPOBJS     = lock.obj
-
-BUTMOBJS    = file_tm.obj AFS_component_version_number.obj
-BUTMLIBS    = afstbutm.lib
+BUTMOBJS    = $(OUT)\file_tm.obj \
+              $(OUT)\AFS_component_version_number.obj
+BUTMLIBS    = $(OUT)\afstbutm.lib
 BUTMINCLUDE = -I$(DESTDIR)\include
 
-BUTCOBJS   = dbentries.obj tcprocs.obj lwps.obj tcmain.obj list.obj recoverDb.obj \
-            tcudbprocs.obj dump.obj tcstatus.obj butc_xbsa.obj \
-             $(LWPOBJS) $(BUCOORDOBJS)
-BUTCINCLUDE= -I. -I$(DESTDIR)\include -I$(XBSADIR)\
-BUTCLIBS   = $(DESTDIR)\lib\afs\afsbudb.lib \
+BUTCOBJS   = $(OUT)\dbentries.obj \
+         $(OUT)\tcprocs.obj \
+         $(OUT)\lwps.obj \
+         $(OUT)\tcmain.obj \
+         $(OUT)\list.obj \
+         $(OUT)\recoverDb.obj \
+            $(OUT)\tcudbprocs.obj \
+         $(OUT)\dump.obj \
+         $(OUT)\tcstatus.obj \
+         $(OUT)\butc_xbsa.obj \
+         $(LWPOBJS) \
+         $(BUCOORDOBJS)
+
+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\afsubik.lib \
             $(DESTDIR)\lib\afs\afsauth.lib \
-\
             $(DESTDIR)\lib\afsrpc.lib \
              $(DESTDIR)\lib\afsrxkad.lib \
-            $(DESTDIR)\lib\afsrx.lib \
-             $(DESTDIR)\lib\afslwp.lib \
-\
+            $(DESTDIR)\lib\afs\mtafsubik.lib \
              $(DESTDIR)\lib\afs\afsutil.lib \
              $(DESTDIR)\lib\afs\afsusd.lib \
             $(DESTDIR)\lib\afs\afspioctl.lib \
@@ -70,89 +78,76 @@ BUTCLIBS   = $(DESTDIR)\lib\afs\afsbudb.lib \
             $(DESTDIR)\lib\afs\afsreg.lib \
             $(DESTDIR)\lib\afs\afsprocmgmt.lib \
              $(DESTDIR)\lib\afs\afseventlog.lib \
-            $(DESTDIR)\lib\pthread.lib \
-            $(DESTDIR)\lib\afsdes.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
-
-include ..\config\NTMakefile.version
-
-# rm tcstatus.obj
+!IF (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" ))
+       $(DESTDIR)\lib\win95\afspthread.lib \
+!ELSE
+       $(DESTDIR)\lib\afspthread.lib \
+!ENDIF
+            $(DESTDIR)\lib\afsdes.lib \
+            $(DESTDIR)\lib\libafsconf.lib
+
+
+# rm $(OUT)\tcstatus.obj
 # nmake /nologo /f ntmakefile install
 #----------------------------------------------- BUTC
 
-$(BUTCEXE): $(BUTCOBJS) $(BUTCLIBS)
-       $(EXECONLINK)
+$(BUTCRES): butc.rc AFS_component_version_number.h
+
+$(BUTCEXE): $(BUTCOBJS) $(BUTCRES) $(BUTCLIBS)
+       $(EXECONLINK) dnsapi.lib mpr.lib shell32.lib
+        $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
-#      $(C2OBJ) $**
+.c.$(OUT)\obj:
+       $(C2OBJ) -I$(BUCOORD) $<
 
-dbentries.obj: $(BUTC)/dbentries.c
+$(OUT)\dbentries.obj: $(BUTC)/dbentries.c
        $(C2OBJ) $**
 
-tcprocs.obj: $(BUTC)/tcprocs.c
+$(OUT)\tcprocs.obj: $(BUTC)/tcprocs.c
        $(C2OBJ) $**
 
-lwps.obj: $(BUTC)/lwps.c
+$(OUT)\lwps.obj: $(BUTC)/lwps.c
        $(C2OBJ) $**
 
-tcmain.obj: $(BUTC)/tcmain.c
+$(OUT)\tcmain.obj: $(BUTC)/tcmain.c
        $(C2OBJ) $**
 
-list.obj: $(BUTC)/list.c
+$(OUT)\list.obj: $(BUTC)/list.c
        $(C2OBJ) $**
 
-recoverDb.obj: $(BUTC)/recoverDb.c
+$(OUT)\recoverDb.obj: $(BUTC)/recoverDb.c
        $(C2OBJ) $**
 
-tcudbprocs.obj: $(BUTC)/tcudbprocs.c
+$(OUT)\tcudbprocs.obj: $(BUTC)/tcudbprocs.c
        $(C2OBJ) $**
 
-dump.obj: $(BUTC)/dump.c
+$(OUT)\dump.obj: $(BUTC)/dump.c
        $(C2OBJ) $**
 
-tcstatus.obj: $(BUTC)/tcstatus.c
+$(OUT)\tcstatus.obj: $(BUTC)/tcstatus.c
        $(C2OBJ) $**
 
-butc_xbsa.obj: $(BUTC)/butc_xbsa.c
+$(OUT)\butc_xbsa.obj: $(BUTC)/butc_xbsa.c
        $(C2OBJ) $**
 
 #----------------------------------------------- BUCOORD
 
-ubik_db_if.obj: $(BUCOORD)/ubik_db_if.c
-       $(C2OBJ) $**
-
-#----------------------------------------------- VOLSER
-# Build the afstvolser.lib library here. The file compiled
-# for is is vsprocs.c. The rest are from the VOLSER dir.
-
-afstvolser.lib: $(VOLSERLIBOBJ)
-       $(LIBARCH)
-
-vsprocs.obj: $(VOLSER)/vsprocs.c
-       $(C2OBJ) $**
+$(OUT)\ubik_db_if.obj: $(BUCOORD)/ubik_db_if.c
+       $(C2OBJ) -I$(BUCOORD) $**
 
 #----------------------------------------------- LWP
 
-lock.obj: $(LWP)/lock.c
+$(OUT)\lock.obj: $(LWP)/lock.c
        $(C2OBJ) $**
 
 #----------------------------------------------- BUTC
 
-file_tm.obj: $(BUTM)/file_tm.c
-
-file_tm.obj: $(BUTM)/file_tm.c
+$(OUT)\file_tm.obj: $(BUTM)/file_tm.c
        $(C2OBJ) $**
 
-afstbutm.lib: $(BUTMOBJS)
+$(OUT)\afstbutm.lib: $(BUTMOBJS)
        $(LIBARCH)
 
 #-----------------------------------------------
@@ -162,3 +157,8 @@ all: $(BUTCEXE) $(BUTMLIBS)
 install: all
 
 noversion: install
+
+mkdir:
+       
+clean::
+       $(DEL) $(BUTCRES)