diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-03 22:31:51 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-03 22:31:51 +0000 |
| commit | ad7084d385d8134b3a5b023511cedbf322c52555 (patch) | |
| tree | 3325d2bedf0c6feb0176cc09dd9e891b1f04cd51 /TAO/orbsvcs/Logging_Service | |
| parent | 302a8922dc1f825e4b6099525862a69131d38004 (diff) | |
| download | ATCD-ad7084d385d8134b3a5b023511cedbf322c52555.tar.gz | |
ChangeLogTag: Sat May 3 22:23:22 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/Logging_Service')
4 files changed, 22 insertions, 6 deletions
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am index 9ce456829f5..178633ca9f8 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am @@ -26,7 +26,9 @@ Basic_Logging_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include Basic_Logging_Service_SOURCES = \ Basic_Logging_Server.cpp \ @@ -39,7 +41,9 @@ Basic_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am index 496279e6e66..959dd8c703f 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am @@ -28,6 +28,8 @@ Event_Logging_Service_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL Event_Logging_Service_SOURCES = \ @@ -46,7 +48,9 @@ Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \ diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am index b4bf6750025..f49bbfb5748 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am @@ -27,6 +27,8 @@ Notify_Logging_Service_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL Notify_Logging_Service_SOURCES = \ @@ -42,7 +44,9 @@ Notify_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Skel.la \ diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index 7ddb772b880..857d099b546 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -28,7 +28,9 @@ RTEvent_Logging_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include RTEvent_Logging_Service_SOURCES = \ RTEvent_Logging_Server.cpp \ @@ -41,7 +43,9 @@ RTEvent_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ |