summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/examples/Makefile11
-rw-r--r--TAO/examples/POA/Makefile9
-rw-r--r--TAO/examples/Simulator/Makefile12
-rw-r--r--TAO/orbsvcs/performance-tests/Makefile11
-rw-r--r--TAO/orbsvcs/tests/Event/Makefile12
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Makefile10
-rw-r--r--TAO/performance-tests/Makefile10
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Makefile11
8 files changed, 75 insertions, 11 deletions
diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile
index d85bca7759f..8abeff5a8f1 100644
--- a/TAO/examples/Makefile
+++ b/TAO/examples/Makefile
@@ -20,8 +20,6 @@ DIRS = Callback_Quoter \
Persistent_Grid \
AMI \
Quoter \
- Buffered_Oneways \
- Buffered_AMI \
Load_Balancing_persistent \
Simulator \
Content_Server \
@@ -39,6 +37,15 @@ endif
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(corba_messaging),1)
+
+DIRS += \
+ Buffered_AMI \
+ Buffered_Oneways
+
+endif # corba_messaging
+
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
diff --git a/TAO/examples/POA/Makefile b/TAO/examples/POA/Makefile
index 00b9c63518f..daea2784fd0 100644
--- a/TAO/examples/POA/Makefile
+++ b/TAO/examples/POA/Makefile
@@ -14,7 +14,6 @@ DIRS = Generic_Servant \
RootPOA \
Reference_Counted_Servant \
Adapter_Activator \
- DSI \
Default_Servant \
Explicit_Activation \
FindPOA \
@@ -35,6 +34,14 @@ endif
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(corba_messaging),1)
+
+DIRS += \
+ DSI
+
+endif # corba_messaging
+
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
diff --git a/TAO/examples/Simulator/Makefile b/TAO/examples/Simulator/Makefile
index acb27989ac4..85b9ba76a1c 100644
--- a/TAO/examples/Simulator/Makefile
+++ b/TAO/examples/Simulator/Makefile
@@ -8,7 +8,8 @@
# Local macros
#----------------------------------------------------------------------------
-DIRS = Event_Supplier
+
+DIRS =
# DOVEBrowser
@@ -23,6 +24,15 @@ endif
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(corba_messaging),1)
+
+DIRS += \
+ Event_Supplier
+
+endif # corba_messaging
+
+
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/orbsvcs/performance-tests/Makefile b/TAO/orbsvcs/performance-tests/Makefile
index 6ae87677b85..43557f752ee 100644
--- a/TAO/orbsvcs/performance-tests/Makefile
+++ b/TAO/orbsvcs/performance-tests/Makefile
@@ -9,8 +9,6 @@
#----------------------------------------------------------------------------
DIRS = \
- EC_Latency \
- EC_Federated_Latency \
EC_Scalability \
EC_Federated_Scalability
@@ -24,6 +22,15 @@ endif
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(corba_messaging),1)
+
+DIRS += \
+ EC_Latency \
+ EC_Federated_Latency
+
+endif # corba_messaging
+
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
diff --git a/TAO/orbsvcs/tests/Event/Makefile b/TAO/orbsvcs/tests/Event/Makefile
index 852e339c598..2bbd0657fd6 100644
--- a/TAO/orbsvcs/tests/Event/Makefile
+++ b/TAO/orbsvcs/tests/Event/Makefile
@@ -9,8 +9,7 @@
#----------------------------------------------------------------------------
DIRS = lib \
- Basic \
- Performance
+ Basic
ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
@@ -23,6 +22,15 @@ endif
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(corba_messaging),1)
+
+DIRS += \
+ Performance
+
+endif # corba_messaging
+
+
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile
index 0e801f0bb25..0353e7ebc47 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile
@@ -9,7 +9,6 @@
#----------------------------------------------------------------------------
DIRS = RedGreen \
- Throughput \
Filter
ifndef TAO_ROOT
@@ -23,6 +22,15 @@ endif
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(corba_messaging),1)
+
+DIRS += \
+ Throughput
+
+endif # corba_messaging
+
+
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/performance-tests/Makefile b/TAO/performance-tests/Makefile
index 5b3327a24f3..a6abb2f56aa 100644
--- a/TAO/performance-tests/Makefile
+++ b/TAO/performance-tests/Makefile
@@ -15,7 +15,6 @@ DIRS = Cubit \
Pluggable \
RTCorba \
Latency \
- Callback \
Throughput
ifndef TAO_ROOT
@@ -28,6 +27,15 @@ endif
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(corba_messaging),1)
+
+DIRS += \
+ Callback
+
+endif # corba_messaging
+
+
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
diff --git a/TAO/performance-tests/RTCorba/Oneways/Makefile b/TAO/performance-tests/RTCorba/Oneways/Makefile
index 45e8fdc46c6..e7835e0745b 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Makefile
+++ b/TAO/performance-tests/RTCorba/Oneways/Makefile
@@ -10,7 +10,7 @@
# Local macros
#----------------------------------------------------------------------------
-DIRS = Reliable
+DIRS =
ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
@@ -22,6 +22,15 @@ endif
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(corba_messaging),1)
+
+DIRS += \
+ Reliable
+
+endif # corba_messaging
+
+
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
View Lorry Controller Status