diff options
Diffstat (limited to 'TAO/orbsvcs/LifeCycle_Service')
7 files changed, 33 insertions, 32 deletions
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h index d170b8fdca1..6551226a03b 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h @@ -14,8 +14,8 @@ // ============================================================================ -#include "orbsvcs/CosLifeCycleC.h" -#include "orbsvcs/LifeCycleServiceC.h" +#include "orbsvcs/orbsvcs/CosLifeCycleC.h" +#include "orbsvcs/orbsvcs/LifeCycleServiceC.h" #ifndef CRITERIA_EVALUATOR_H_H #define CRITERIA_EVALUATOR_H_H diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp index f088231c4f2..9fd155d9179 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp @@ -20,7 +20,7 @@ // ============================================================================ #include "Factory_Trader.h" -#include "orbsvcs/CosTradingC.h" +#include "orbsvcs/orbsvcs/CosTradingC.h" ACE_RCSID (LifeCycle_Service, Factory_Trader, diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h index ebf8a024d32..5a42d04a3cb 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h @@ -17,9 +17,9 @@ #ifndef FACTORY_TRADER_H #define FACTORY_TRADER_H -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Service_Type_Repository.h" -#include "orbsvcs/CosLifeCycleC.h" +#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/orbsvcs/CosLifeCycleC.h" class Factory_Trader diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc index 1375457f260..ce6a8681ac2 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc @@ -1,6 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, lifecycle, naming, trading_serv, minimum_corba { +project : orbsvcsexe, core, lifecycle, naming, trading { + avoids += minimum_corba exename = LifeCycle_Service } diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp index a1e011451b8..b0a3411bbaa 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp @@ -15,7 +15,7 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/LifeCycleServiceC.h" +#include "orbsvcs/orbsvcs/LifeCycleServiceC.h" #include "LifeCycle_Service_i.h" diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h index 2997da242a5..562d97451de 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h @@ -13,7 +13,7 @@ // // ============================================================================ -#include "orbsvcs/LifeCycleServiceS.h" +#include "orbsvcs/orbsvcs/LifeCycleServiceS.h" #include "Factory_Trader.h" #include "Criteria_Evaluator.h" diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am index 1583bc278c8..b1ca8c9c112 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am @@ -7,41 +7,41 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.LifeCycle_Service.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS = LifeCycle_Service +noinst_PROGRAMS = LifeCycle_Service LifeCycle_Service_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 LifeCycle_Service_SOURCES = \ - Criteria_Evaluator.cpp \ Factory_Trader.cpp \ + Criteria_Evaluator.cpp \ LifeCycle_Service.cpp \ - LifeCycle_Service_i.cpp \ - Criteria_Evaluator.h \ - Factory_Trader.h \ - LifeCycle_Service.h \ - LifeCycle_Service_i.h + LifeCycle_Service_i.cpp LifeCycle_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.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 + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.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 = \ + LifeCycle_Service_i.h \ + Factory_Trader.h \ + Criteria_Evaluator.h \ + LifeCycle_Service.h ## Clean up template repositories, etc. clean-local: |