X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Frx%2Ftest%2FNTMakefile;h=38fa7df2e0348560ec9cd8ff76628c776d6767fb;hp=4b4e730027e850959c059b3777d5bf0ba10adfdb;hb=06cc5bec2c2485f49a39fcd4af378279178fab36;hpb=5df76f7321420832c14f9d1862eee13b081b39af

diff --git a/src/rx/test/NTMakefile b/src/rx/test/NTMakefile
index 4b4e730..38fa7df 100644
--- a/src/rx/test/NTMakefile
+++ b/src/rx/test/NTMakefile
@@ -5,31 +5,57 @@
 # 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 = -DRXDEBUG
+AFSDEV_AUXCDEFINES = -DAFS_PTHREAD_ENV -DHAVE_WARNX -DHAVE_ERRX -DHAVE_WARN -DHAVE_ERR
+!IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DRXDEBUG
+!ENDIF
 
+RELDIR=rx\test
 !INCLUDE ..\..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\..\config\NTMakefile.version
 
-
 LIBS = \
-	$(DESTDIR)\lib\afslwp.lib \
-	$(DESTDIR)\lib\afs\afsutil.lib \
 	$(DESTDIR)\lib\afs\afsreg.lib \
-	$(DESTDIR)\lib\afsrx.lib
+	$(DESTDIR)\lib\afs\mtafsutil.lib \
+	$(DESTDIR)\lib\afsrpc.lib \
+	$(DESTDIR)\lib\afspthread.lib \
+        $(DESTDIR)\lib\afsroken.lib \
+	$(DESTDIR)\lib\opr.lib
 
 
-RXTESTOBJS = $(OJT)\testclient.obj $(OJT)\testserver.obj
+RXTESTOBJS = $(OUT)\testclient.obj $(OUT)\testserver.obj
 
+tests: $(OUT)\testclient.exe $(OUT)\testserver.exe $(OUT)\tableGen.exe $(OUT)\generator.exe
 
-tests: $(OJT)\testclient.exe $(OJT)\testserver.exe $(OJT)\tableGen.exe $(OJT)\generator.exe
+$(OUT)\testclient.exe: $(OUT)\testclient.obj $(LIBS)
+	$(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
-testclient.exe: $(OJT)\testclient.obj $(LIBS)
+$(OUT)\testserver.exe: $(OUT)\testserver.obj $(LIBS)
 	$(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
-testserver.exe: $(OJT)\testserver.obj $(LIBS)
+$(OUT)\tableGen.exe: $(OUT)\tableGen.obj $(LIBS)
 	$(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
+
+$(OUT)\generator.exe: $(OUT)\generator.obj $(LIBS)
+	$(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 $(RXTESTOBJS): ..\rx_clock.h ..\rx_queue.h ..\rx_event.h ..\rx.h
 
 mkdir:
 	
+install: tests
+
+clean::
+    $(DEL) $(TESTS)