summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhuangming <huangminghuang@users.noreply.github.com>2003-10-17 23:12:26 +0000
committerhuangming <huangminghuang@users.noreply.github.com>2003-10-17 23:12:26 +0000
commitc1022b20d892977b2e32e74725bbb2991f007060 (patch)
treeb0bb823a18dbef7336527541f99a2f090579107c
parent4b2b804ee28c7228a9e14e58b63be2ce423071b5 (diff)
downloadATCD-c1022b20d892977b2e32e74725bbb2991f007060.tar.gz
Fri Oct 17 18:11:20 2003 Huang-Ming Huang <hh1@cse.wustl.edu>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/orbsvcs/tests/Makefile9
2 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 45f8918c720..16b5fa15886 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 17 18:11:20 2003 Huang-Ming Huang <hh1@cse.wustl.edu>
+
+ * orbsvcs/tests/Makefile: Changed criteria for building
+ EC_Multiple test - build it only when RTOLDEvent library is
+ built.
+
Fri Oct 17 17:37:05 2003 Huang-Ming Huang <hh1@cse.wustl.edu>
* orbsvcs/orbsvcs/Makefile.RTCosScheduling:
diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile
index 8b550e4301b..05605cc7510 100644
--- a/TAO/orbsvcs/tests/Makefile
+++ b/TAO/orbsvcs/tests/Makefile
@@ -22,11 +22,18 @@ DIRS = \
ifeq ($(corba_messaging),1)
DIRS += \
- EC_Multiple \
EC_Throughput \
EC_Mcast \
EC_MT_Mcast \
EC_Custom_Marshal
+
+ ifdef TAO_ORBSVCS
+ ifneq (,$(findstring RTOLDEvent,$(TAO_ORBSVCS)))
+ DIRS += EC_Multiple
+ endif
+ else
+ DIRS += EC_Multiple
+ endif
endif # corba_messaging
DIRS += \