ubik-call-sucks-20060704

[openafs.git] / src / libadmin / pts / NTMakefile

diff --git a/src/libadmin/pts/NTMakefile b/src/libadmin/pts/NTMakefile
index 36a2e69..15883fc 100644 (file)
--- a/src/libadmin/pts/NTMakefile
+++ b/src/libadmin/pts/NTMakefile
@@ -7,21 +7,26 @@
 
 AFSDEV_AUXCDEFINES = -DAFS_PTHREAD_ENV
 
+RELDIR=libadmin\pts
 !include ..\..\config\NTMakefile.$(SYS_NAME)
 !include ..\..\config\NTMakefile.version
 
-PTSERVER = ..\..\ptserver\
+PTSERVER = ..\..\ptserver
+RX = ..\..\rx
+
+RXOBJS = $(OUT)\xdr_int32.obj $(OUT)\xdr_int64.obj
 
 PTSERVEROBJS = \
-       ptint.xdr.obj ptint.cs.obj
+       $(OUT)\ptint.xdr.obj $(OUT)\ptint.cs.obj
 
 ADMINOBJS = \
-       afs_ptsAdmin.obj
+       $(OUT)\afs_ptsAdmin.obj
 
 DLLOBJS =\
        $(ADMINOBJS) \
        $(PTSERVEROBJS) \
-       afsptsadmin.res
+       $(RXOBJS) \
+       $(OUT)\afsptsadmin.res
 
 LIBINCLUDES = \
        $(DESTDIR)\include\afs\afs_ptsAdmin.h
@@ -33,10 +38,12 @@ DLLLIBS =\
        $(DESTDIR)\lib\afs\afsadminutil.lib \
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\afsrpc.lib \
-       $(DESTDIR)\lib\pthread.lib
+       $(DESTDIR)\lib\afspthread.lib \
+       $(DESTDIR)\lib\afs\afsutil.lib
 
 $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
        $(DLLCONLINK) /DEF:ptsadmin.def
+        $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
@@ -45,14 +52,15 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
 
 install: $(DLLFILE) $(LIBINCLUDES)
 
+$(RXOBJS): $(RX)\$$(@B).c
+       $(C2OBJ) -I$(RX) $**
 
+$(PTSERVEROBJS): $(PTSERVER)\$$(@B).c
+       $(C2OBJ) $**
 
-ptint.xdr.obj: $(PTSERVER)\ptint.xdr.c
-       $(C2OBJ) $(PTSERVER)\ptint.xdr.c
+# Definitions for generating versioninfo resources
 
-ptint.cs.obj: $(PTSERVER)\ptint.cs.c
-       $(C2OBJ) $(PTSERVER)\ptint.cs.c
+$(OUT)\afsptsadmin.res: AFS_component_version_number.h
 
-# Definitions for generating versioninfo resources
-afsptsadmin.res: afsptsadmin.rc AFS_component_version_number.h
-       $(RC) $*.rc
+mkdir:
+