6 files changed, 50 insertions, 65 deletions
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
index 2574a799cfd..1528d5321b4 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
@@ -1,10 +1,7 @@
 // -*- MPC -*-
-//
 // $Id$
 
-
-project(LoadManager): namingexe, portableserver, core, iortable, iormanip, loadbalancing {
-  exename  = LoadManager
+project(CosLoadManager): namingexe, portableserver, core, iormanip, loadbalancing {
   requires += ami interceptors
   Source_Files {
     LoadManager.cpp
@@ -12,9 +9,8 @@ project(LoadManager): namingexe, portableserver, core, iortable, iormanip, loadb
   }
 }
 
-project(LoadMonitor): namingexe, portableserver, core, loadbalancing {
+project(CosLoadMonitor): namingexe, portableserver, core, loadbalancing {
   requires += ami interceptors
-  exename  = LoadMonitor
   Source_Files {
     LoadMonitor.cpp
     Push_Handler.cpp
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index c1976869d18..e554d610122 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -1,6 +1,6 @@
 #include "Signal_Handler.h"
 
-#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index f358baac632..aaadc7a2e05 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -1,8 +1,8 @@
 #include "Push_Handler.h"
 #include "Monitor_Signal_Handler.h"
 
-#include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h"
-#include "orbsvcs/LoadBalancing/LB_conf.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_conf.h"
 
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am
index ab6a73c5bef..41c2fd88751 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.am
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.am
@@ -5,86 +5,75 @@ ACE_BUILDDIR = $(top_builddir)/..
 TAO_ROOT = $(top_srcdir)
 TAO_BUILDDIR = $(top_builddir)
 
-## Makefile.LoadManager.am 
+## Makefile.CosLoadManager.am 
 
-if BUILD_AMI
-if BUILD_INTERCEPTORS
-if !BUILD_MINIMUM_CORBA
-
-bin_PROGRAMS = LoadManager
+noinst_PROGRAMS = LoadManager
 
 LoadManager_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 LoadManager_SOURCES = \
   LoadManager.cpp \
-  Signal_Handler.cpp \
-  Signal_Handler.h
+  Signal_Handler.cpp
 
 LoadManager_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_INTERCEPTORS
-endif BUILD_AMI
-
-## Makefile.LoadMonitor.am 
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+  Signal_Handler.h
 
-if BUILD_AMI
-if BUILD_INTERCEPTORS
-if !BUILD_MINIMUM_CORBA
+## Makefile.CosLoadMonitor.am 
 
-bin_PROGRAMS += LoadMonitor
+noinst_PROGRAMS += LoadMonitor
 
 LoadMonitor_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 LoadMonitor_SOURCES = \
   LoadMonitor.cpp \
-  Monitor_Signal_Handler.cpp \
   Push_Handler.cpp \
-  Signal_Handler.cpp \
-  Monitor_Signal_Handler.h \
-  Push_Handler.h \
-  Signal_Handler.h
+  Monitor_Signal_Handler.cpp \
+  Signal_Handler.cpp
 
 LoadMonitor_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_INTERCEPTORS
-endif BUILD_AMI
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+  Push_Handler.h \
+  Signal_Handler.h \
+  Monitor_Signal_Handler.h
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h
index aee41ca5e76..97d44eeb471 100644
--- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h
+++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h
@@ -20,7 +20,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 
 /**
diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.h b/TAO/orbsvcs/LoadBalancer/Push_Handler.h
index 7913a399f72..1faa67aaf3b 100644
--- a/TAO/orbsvcs/LoadBalancer/Push_Handler.h
+++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
 
 #include "ace/Event_Handler.h"