ChangeLogTag:Tue Aug 13 08:22:33 2002 Ossama Othman <ossama@uci.edu>

5 files changed, 40 insertions, 24 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c3d4830cb0e..146e91cd283 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue Aug 13 08:22:33 2002  Ossama Othman  <ossama@uci.edu>
+
+	* orbsvcs/LoadBalancer/Makefile:
+	* orbsvcs/LoadBalancer/Makefile.LoadManager:
+	* orbsvcs/LoadBalancer/Makefile.LoadMonitor:
+	* orbsvcs/orbsvcs/Makefile.CosLoadBalancing:
+
+	  Do not build the Load Balancer related binaries if
+	  PortableInterceptor support is disabled.  Interceptor support is
+	  required.
+
 Tue Aug 13 07:54:39 2002  Ossama Othman  <ossama@uci.edu>
 
 	* orbsvcs/orbsvcs/CosLoadBalancing.bor:
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile b/TAO/orbsvcs/LoadBalancer/Makefile
index 4f924659765..224735f7ce4 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile
+++ b/TAO/orbsvcs/LoadBalancer/Makefile
@@ -8,6 +8,11 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+
 BIN = LoadManager LoadMonitor
 
 #----------------------------------------------------------------------------
@@ -16,6 +21,23 @@ BIN = LoadManager LoadMonitor
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+
+ifeq (CosLoadBalancing,$(findstring CosLoadBalancing,$(TAO_ORBSVCS)))
+# The Load Balancer requires AMI.
+  ifeq ($(ami),0)
+    BIN =
+  endif  # !ami
+
+  ifeq ($(interceptors),0)
+    BIN =
+  endif  # !interceptors
+endif  # CosLoadBalancing
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager b/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
index 49df1ce72a9..ee52fc2eea7 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
@@ -22,7 +22,7 @@ LDLIBS = \
   -lTAO_PortableServer \
   -lTAO
 
-BIN2 = LoadManager
+BIN = LoadManager
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -32,16 +32,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (CosLoadBalancing,$(findstring CosLoadBalancing,$(TAO_ORBSVCS)))
-# The Load Balancer requires AMI.
-  ifeq ($(ami),1)
-    BIN = $(BIN2)
-  endif # ami
-endif  # CosLoadBalancing
-
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
index 886b0b0899c..79c4dbd2c93 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
@@ -22,7 +22,7 @@ LDLIBS = \
   -lTAO_PortableServer \
   -lTAO
 
-BIN2 = LoadMonitor
+BIN = LoadMonitor
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -31,17 +31,6 @@ BIN2 = LoadMonitor
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (CosLoadBalancing,$(findstring CosLoadBalancing,$(TAO_ORBSVCS)))
-# The Load Balancer requires AMI.
-  ifeq ($(ami),1)
-    BIN = $(BIN2)
-  endif # ami
-endif  # CosLoadBalancing
-
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing b/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing
index 08befdc9e56..971bd9f7924 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing
@@ -30,12 +30,16 @@ ACE_SHLIBS = \
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
-# The Load Balancer requires AMI.
+# The Load Balancer requires AMI and PortableInterceptor support.
 ifeq ($(ami),0)
 LIB      =
 SHLIB    =
 endif  # !ami
 
+ifeq ($(interceptors),0)
+LIB      =
+SHLIB    =
+endif  # !interceptors
 
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.