ChangeLogTag:Sat Nov 1 11:30:20 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

9 files changed, 46 insertions, 14 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 695292183f8..21e2dd312ee 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Sat Nov  1 11:30:20 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* performance-tests/Cubit/TAO/DII_Cubit/Makefile
+	* performance-tests/Latency/DII/Makefile:
+	* performance-tests/Latency/DSI/Makefile:
+	* performance-tests/Sequence_Latency/DII/Makefile:
+	* performance-tests/Sequence_Latency/DSI/Makefile:
+	* performance-tests/Sequence_Latency/Deferred/Makefile:
+	* orbsvcs/examples/ORT/Makefile:
+	* orbsvcs/tests/InterfaceRepo/Application_Test/Makefile:
+
+	  Do not compile if corba_messaging is turned off. 
+	
 Sat Nov  1 09:56:10 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
 
 	* orbsvcs/examples/RtEC/Kokyu/Service.cpp: Added fixes to get rid
diff --git a/TAO/orbsvcs/examples/ORT/Makefile b/TAO/orbsvcs/examples/ORT/Makefile
index fed2093a5c5..b496b9288d8 100644
--- a/TAO/orbsvcs/examples/ORT/Makefile
+++ b/TAO/orbsvcs/examples/ORT/Makefile
@@ -55,9 +55,11 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
-ifeq ($(interceptors), 1)
-BIN = $(BIN_UNCHECKED)
-endif # interceptors
+ifeq ($(corba_messaging),1)
+  ifeq ($(interceptors), 1)
+BIN=$(BIN_UNCHECKED)
+  endif # interceptors
+endif # corba_messaging
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
index 16d70d02828..8a31e863257 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
@@ -38,6 +38,11 @@ TAO_IDLFLAGS += -Ge 1
 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)
+BIN=$(BIN_UNCHECKED)
+endif # corba_messaging
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
index 2b1911da8bc..6732efc088a 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
@@ -39,9 +39,11 @@ BUILD += ../IDL_Cubit/server
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
-ifeq ($(minimum_corba),0)
+ifeq ($(corba_messaging),1)
+  ifeq ($(minimum_corba),0)
   BIN=$(BIN_UNCHECKED)
-endif # minimum_corba
+  endif # minimum_corba
+endif # corba_messaging
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
diff --git a/TAO/performance-tests/Latency/DII/Makefile b/TAO/performance-tests/Latency/DII/Makefile
index cc0243cbc87..27e0082f463 100644
--- a/TAO/performance-tests/Latency/DII/Makefile
+++ b/TAO/performance-tests/Latency/DII/Makefile
@@ -30,8 +30,10 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
-ifeq ($(minimum_corba),0)
-  BIN = $(BIN_UNCHECKED)
+ifeq ($(corba_messaging),1)
+  ifeq ($(minimum_corba),0)
+    BIN = $(BIN_UNCHECKED)
+  endif # corba_messaging
 endif # minimum_corba
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/performance-tests/Latency/DSI/Makefile b/TAO/performance-tests/Latency/DSI/Makefile
index 864da02b5e0..35c2f33b5ce 100644
--- a/TAO/performance-tests/Latency/DSI/Makefile
+++ b/TAO/performance-tests/Latency/DSI/Makefile
@@ -30,8 +30,10 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
-ifeq ($(minimum_corba),0)
-  BIN = $(BIN_UNCHECKED)
+ifeq ($(corba_messaging),1)
+  ifeq ($(minimum_corba),0)
+    BIN = $(BIN_UNCHECKED)
+  endif # corba_messaging
 endif # minimum_corba
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile b/TAO/performance-tests/Sequence_Latency/DII/Makefile
index fc99b04f4fa..c582d542a58 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Makefile
+++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile
@@ -30,8 +30,10 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
-ifeq ($(minimum_corba),0)
-  BIN = $(BIN_UNCHECKED)
+ifeq ($(corba_messaging),1)
+  ifeq ($(minimum_corba),0)
+    BIN = $(BIN_UNCHECKED)
+  endif # corba_messaging
 endif # minimum_corba
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile b/TAO/performance-tests/Sequence_Latency/DSI/Makefile
index 92ca0ac1204..e4d0df12518 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile
@@ -30,9 +30,11 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
-ifeq ($(minimum_corba),0)
-  BIN = $(BIN_UNCHECKED)
-endif # minimum_corba
+ifeq ($(corba_messaging),1)
+  ifeq ($(minimum_corba),0)
+    BIN = $(BIN_UNCHECKED)
+  endif # minimum_corba
+endif # corba_messaging
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile
index 3d0d77ae3b3..6439c9e1183 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile
@@ -30,9 +30,11 @@ 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)
 ifeq ($(minimum_corba),0)
   BIN = $(BIN_UNCHECKED)
 endif # minimum_corba
+endif # corba_messaging
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU