libafsrpc: link afsrpc.dll to afsrfc3961.lib

[openafs.git] / src / libafsrpc / NTMakefile

diff --git a/src/libafsrpc/NTMakefile b/src/libafsrpc/NTMakefile
index 311f80f..c5fece3 100644 (file)
--- a/src/libafsrpc/NTMakefile
+++ b/src/libafsrpc/NTMakefile
@@ -6,7 +6,7 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 
 RELDIR=libafsrpc
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DNOGDI -DWIN32_LEAN_AND_MEAN -DAFS_PTHREAD_ENV
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DNOGDI -DWIN32_LEAN_AND_MEAN -DAFS_PTHREAD_ENV -DMAKEDEBUGCALL
 !include ..\config\NTMakefile.$(SYS_NAME)
 !include ..\config\NTMakefile.version
 
@@ -38,27 +38,31 @@ RXOBJS = $(OUT)\rx_event.obj $(OUT)\rx_user.obj $(OUT)\rx_pthread.obj \
         $(OUT)\rx_packet.obj $(OUT)\rx_rdwr.obj $(OUT)\rx_trace.obj \
         $(OUT)\rx_xmit_nt.obj $(OUT)\rx_conncache.obj $(OUT)\rx_opaque.obj \
         $(OUT)\rx_identity.obj $(OUT)\rx_stats.obj \
-         $(OUT)\rx_conn.obj
+         $(OUT)\rx_call.obj $(OUT)\rx_conn.obj $(OUT)\rx_peer.obj
 
 RXSTATBJS = $(OUT)\rxstat.obj $(OUT)\rxstat.ss.obj $(OUT)\rxstat.xdr.obj $(OUT)\rxstat.cs.obj
 
-LIBRXKAD_OBJS = $(OUT)\rxkad_client.obj $(OUT)\rxkad_server.obj $(OUT)\rxkad_common.obj $(OUT)\ticket.obj \
-       $(OUT)\ticket5.obj $(OUT)\crc.obj $(OUT)\AFS_component_version_number.obj
+LIBRXKAD_OBJS = $(OUT)\rxkad_client.obj $(OUT)\rxkad_server.obj $(OUT)\rxkad_common.obj $(OUT)\rxkad_errs.obj \
+       $(OUT)\ticket.obj $(OUT)\ticket5.obj $(OUT)\crc.obj $(OUT)\AFS_component_version_number.obj
 
 LIBRXKAD_REGOBJS = $(OUT)\bg-fcrypt.obj
 
-UTILOBJS = $(OUT)\winsock_nt.obj
+UTILOBJS = $(OUT)\winsock_nt.obj \
+           $(OUT)\pthread_glock.obj
 
 COMERRBJS = $(OUT)\error_msg.obj $(OUT)\et_name.obj $(OUT)\com_err.obj
 
 LWPOBJS = $(OUT)\lock.obj $(OUT)\fasttime.obj $(OUT)\threadname.obj
 
-FSINTBJS = $(OUT)\afsint.cs.obj $(OUT)\afsint.xdr.obj $(OUT)\afscbint.cs.obj $(OUT)\afscbint.xdr.obj \
-       $(OUT)\afsaux.obj
+FSINTBJS = $(OUT)\afsint.cs.obj \
+           $(OUT)\afsint.xdr.obj \
+           $(OUT)\afscbint.cs.obj \
+           $(OUT)\afscbint.xdr.obj \
+          $(OUT)\afsaux.obj
 
 DLLOBJS = $(MULTIOBJS) $(RXOBJS) $(XDROBJS) $(RXSTATBJS) $(LIBRXKAD_OBJS) \
-       $(LIBRXKAD_REGOBJS) $(UTILBJS) $(COMERRBJS) \
-       $(FSINTBJS) $(LWPOBJS) $(OUT)\afsrpc.res
+       $(LIBRXKAD_REGOBJS) $(UTILOBJS) $(COMERRBJS) \
+        $(LWPOBJS) $(OUT)\afsrpc.res
 
 $(MULTIOBJS) $(RXOBJS) $(XDROBJS):$(RX)\$$(@B).c
        $(C2OBJ) $** -I$(RX) 
@@ -85,15 +89,12 @@ NTMAKE = nmake /nologo /f ntmakefile
 
 
 DLLLIBS =\
-!IF (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" ))
-       $(DESTDIR)\lib\win95\afspthread.lib \
-!ELSE
        $(DESTDIR)\lib\afspthread.lib \
-!ENDIF
-       $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\afs\mtafsutil.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
        $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
+       $(DESTDIR)\lib\afsrfc3961.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 $(LIBFILE): $(DLLOBJS) $(DLLLIBS)
@@ -109,8 +110,5 @@ $(OUT)\afsrpc.res: AFS_component_version_number.h
 
 install: $(LIBFILE)
 
-install9x: install
-
-
 clean::
        $(DEL) $(DESTDIR)\lib\afsrpc.dll $(DESTDIR)\lib\afsrpc.lib $(DESTDIR)\lib\afsrpc.exp