win32: most tests now build on Watcom

[pdclib.old] / Jamfile

diff --git a/Jamfile b/Jamfile
index bd9305c5e807a2e9d5b4d1b7554a79b699a5f3bf..50e09f808758dd6995c76d81d549e1c186fba75d 100644 (file)
--- a/Jamfile
+++ b/Jamfile
@@ -28,22 +28,23 @@ if ! $(PDCLIB_NO_TEST) {
         regtest     = $(file:S=-regtest) ;\r
 \r
         Object $(testfile).o    : $(file) ;\r
-        Object $(regtestfile).o : $(file) ;\r
         MainFromObjects $(testfile)    : $(testfile).o $(CRT0) ;\r
-        MainFromObjects $(regtestfile) : $(regtestfile).o ;\r
         CCFLAGS on $(testfile).o += -DTEST $(PDCLIB_TEST_CCFLAGS) ;\r
-        CCFLAGS on $(regtestfile).o += -DTEST -DREGTEST \r
-                                       $(PDCLIB_REGTEST_CCFLAGS) ;\r
-        CCHDRS on $(regtestfile).o = [ FIncludes [ FDirName testing ] ] ;\r
-\r
         LINKFLAGS on $(testfile)$(SUFEXE) += $(PDCLIB_TEST_LINKFLAGS) ;\r
-        LINKFLAGS on $(regtestfile)$(SUFEXE) += $(PDCLIB_REGTEST_LINKFLAGS) ;\r
         LINKLIBS on $(testfile)$(SUFEXE) += $(PDCLIB_TEST_LINKLIBS) ;\r
-        LINKLIBS on $(regtestfile)$(SUFEXE) += $(PDCLIB_REGTEST_LINKLIBS) ;\r
         LinkLibraries $(testfile) : $(PDCLIB) ;\r
-\r
         Test    $(test)    : $(testfile) ;\r
-        RegTest $(regtest) : $(regtestfile) ;\r
+\r
+        if ! $(PDCLIB_NO_REGTEST) {\r
+            Object $(regtestfile).o : $(file) ;\r
+            MainFromObjects $(regtestfile) : $(regtestfile).o ;\r
+            CCFLAGS on $(regtestfile).o += -DTEST -DREGTEST \r
+                                    $(PDCLIB_REGTEST_CCFLAGS) ;\r
+            CCHDRS on $(regtestfile).o = [ FIncludes [ FDirName testing ] ] $(PDCLIB_REGTEST_CCHDRS) ;\r
+            LINKFLAGS on $(regtestfile)$(SUFEXE) += $(PDCLIB_REGTEST_LINKFLAGS) ;\r
+            LINKLIBS on $(regtestfile)$(SUFEXE) += $(PDCLIB_REGTEST_LINKLIBS) ;\r
+            RegTest $(regtest) : $(regtestfile) ;\r
+        }\r
     }\r
 }\r
 \r