tabular_output: enable compilation on Windows

[openafs.git] / src / util / NTMakefile

diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index 0ea4370..1b4c4e5 100644 (file)
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -7,27 +7,28 @@
 
 # General AFS utilities.
 
+RELDIR=util
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 
 INCFILEDIR = $(DESTDIR)\include\afs  # header file install directory
 
 INCFILES =\
+       $(DESTDIR)\include\dirent.h \
        $(INCFILEDIR)\afsutil.h \
-       $(INCFILEDIR)\assert.h \
-       $(INCFILEDIR)\dirent.h \
        $(INCFILEDIR)\errors.h \
-       $(INCFILEDIR)\itc.h \
        $(INCFILEDIR)\vice.h \
        $(INCFILEDIR)\pthread_glock.h \
        $(INCFILEDIR)\pthread_nosigs.h \
        $(INCFILEDIR)\errmap_nt.h \
        $(INCFILEDIR)\dirpath.h \
+        $(INCFILEDIR)\krb5_nt.h \
        $(INCFILEDIR)\ktime.h \
        $(INCFILEDIR)\fileutil.h \
        $(INCFILEDIR)\afsutil_prototypes.h \
-       $(INCFILEDIR)\secutil_nt.h
+       $(INCFILEDIR)\secutil_nt.h \
+       $(INCFILEDIR)\tabular_output.h
 
-$(DESTDIR)\include\afs\dirent.h: dirent_nt.h
+$(DESTDIR)\include\dirent.h: dirent_nt.h
        $(COPY) $** $@
 
 $(DESTDIR)\include\afs\dirpath.h: dirpath_nt.h
@@ -35,35 +36,65 @@ $(DESTDIR)\include\afs\dirpath.h: dirpath_nt.h
 
 LIBFILE = $(DESTDIR)\lib\afs\afsutil.lib
 
+MT_LIBFILE = $(DESTDIR)\lib\afs\mtafsutil.lib
+
 LIBOBJS = \
-       $(OJT)\assert.obj \
-       $(OJT)\base32.obj \
-       $(OJT)\casestrcpy.obj \
-       $(OJT)\get_krbrlm.obj \
-       $(OJT)\hostparse.obj \
-       $(OJT)\isathing.obj \
-       $(OJT)\kreltime.obj \
-       $(OJT)\ktime.obj \
-       $(OJT)\regex.obj \
-       $(OJT)\readdir_nt.obj \
-       $(OJT)\serverLog.obj \
-       $(OJT)\uuid.obj \
-       $(OJT)\volparse.obj \
-       $(OJT)\winsock_nt.obj \
-       $(OJT)\errmap_nt.obj \
-       $(OJT)\dirpath.obj \
-       $(OJT)\fileutil.obj \
-       $(OJT)\secutil_nt.obj
+       $(OUT)\base32.obj \
+       $(OUT)\hostparse.obj \
+        $(OUT)\krb5_nt.obj \
+       $(OUT)\kreltime.obj \
+       $(OUT)\ktime.obj \
+       $(OUT)\regex.obj \
+       $(OUT)\readdir_nt.obj \
+       $(OUT)\serverLog.obj \
+       $(OUT)\uuid.obj \
+       $(OUT)\volparse.obj \
+       $(OUT)\winsock_nt.obj \
+       $(OUT)\errmap_nt.obj \
+       $(OUT)\dirpath.obj \
+       $(OUT)\fileutil.obj \
+       $(OUT)\secutil_nt.obj \
+       $(OUT)\tabular_output.obj
+
+MT_LIBOBJS = \
+       $(OUT)\base32.obj \
+       $(OUT)\hostparse.obj \
+        $(OUT)\krb5_nt.obj \
+       $(OUT)\kreltime.obj \
+       $(OUT)\ktime.obj \
+       $(OUT)\regex.obj \
+       $(OUT)\readdir_nt.obj \
+       $(OUT)\serverLog_mt.obj \
+       $(OUT)\uuid.obj \
+       $(OUT)\volparse.obj \
+       $(OUT)\winsock_nt.obj \
+       $(OUT)\errmap_nt.obj \
+       $(OUT)\dirpath_mt.obj \
+       $(OUT)\fileutil.obj \
+       $(OUT)\secutil_nt.obj \
+       $(OUT)\tabular_output.obj
+
+$(LIBOBJS): $$(@B).c
+    $(C2OBJ) $**
+
+$(OUT)\dirpath_mt.obj:dirpath.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
+
+$(OUT)\serverLog_mt.obj:serverLog.c
+       $(C2OBJ) $** -DAFS_PTHREAD_ENV
 
 $(LIBFILE): $(LIBOBJS)
        $(LIBARCH)
 
-install: $(INCFILES) $(LIBOBJS) $(LIBFILE)
+$(MT_LIBFILE): $(MT_LIBOBJS)
+       $(LIBARCH) Rpcrt4.lib
+
+install_headers: $(INCFILES) 
 
-install9x: install
+install: install_headers $(LIBOBJS) $(LIBFILE) $(MT_LIBFILE)
 
 clean::
        $(DEL) $(LIBFILE)
 
 mkdir:
-       
+