diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-09 18:37:19 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-09 18:37:19 +0000 |
| commit | 588a3fba9b83388465b418ceb9145cab346b118c (patch) | |
| tree | ce4b9a94ea4bf41db97b33df351e606266ef1cc3 /TAO | |
| parent | 88a02eacea34dcf7adfd20dee5b8c4a198c854c8 (diff) | |
| download | ATCD-588a3fba9b83388465b418ceb9145cab346b118c.tar.gz | |
ChangeLogTag: Fri May 9 18:26:24 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
50 files changed, 205 insertions, 319 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f99dbc012d8..03b56f04ab4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,67 @@ +Fri May 9 18:26:24 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/Notify_Service/Makefile.am: + * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am: + * orbsvcs/tests/Log/Basic_Log_Test/Makefile.am: + * orbsvcs/tests/Bug_2926_Regression/Makefile.am: + * orbsvcs/tests/Notify/Basic/Makefile.am: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am: + * orbsvcs/tests/Notify/Test_Filter/Makefile.am: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am: + * orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am: + * orbsvcs/tests/Notify/Blocking/Makefile.am: + * orbsvcs/tests/Notify/Destroy/Makefile.am: + * orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am: + * orbsvcs/tests/Notify/Driver/Makefile.am: + * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am: + * orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am: + * orbsvcs/tests/Notify/PluggableTopology/Makefile.am: + * orbsvcs/tests/Notify/Persistent_POA/Makefile.am: + * orbsvcs/tests/Notify/MC/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am: + * orbsvcs/tests/Notify/XML_Persistence/Makefile.am: + * orbsvcs/tests/Notify/lib/Makefile.am: + * orbsvcs/tests/Notify/Discarding/Makefile.am: + * orbsvcs/tests/Notify/Ordering/Makefile.am: + * orbsvcs/tests/Notify/Structured_Filter/Makefile.am: + * orbsvcs/tests/Notify/RT_lib/Makefile.am: + * orbsvcs/tests/Notify/Reconnecting/Makefile.am: + * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am: + * orbsvcs/Fault_Notifier/Makefile.am: + * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am: + * orbsvcs/examples/Notify/Federation/Agent/Makefile.am: + * orbsvcs/examples/Notify/ThreadPool/Makefile.am: + * orbsvcs/examples/Notify/Lanes/Makefile.am: + * tao/ETCL/Makefile.am: + * tao/Makefile.am: + * utils/monitor/Makefile.am: + * tests/Monitor/Marshal_Buffer/Makefile.am: + * tests/Makefile.am: + * tests/Compression/Makefile.am: + + Regenerated. + + * configure.ac: + + build new directory. + + * tests/Bug_3321_Regression/Makefile.am: + + New Makefile.am. + + * tao/ZlibCompressor.mpc: + * MPC/config/zlibcompressor.mpb: + + Changed to derive from MPC's own zlib base project to ace_zlib + base project to get settings overriden for the automake build. + Fri May 9 18:13:10 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PI/PI.h: diff --git a/TAO/MPC/config/zlibcompressor.mpb b/TAO/MPC/config/zlibcompressor.mpb index 8530956c695..4dc3e791338 100644 --- a/TAO/MPC/config/zlibcompressor.mpb +++ b/TAO/MPC/config/zlibcompressor.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taolib, compression, zlib { +project : taolib, compression, ace_zlib { requires += zlib after += ZlibCompressor libs += TAO_ZlibCompressor diff --git a/TAO/configure.ac b/TAO/configure.ac index 27b418013ee..c372acd2033 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -719,6 +719,7 @@ if test $tao_build_tests = yes; then tests/Bug_3299_Regression/Makefile tests/Bug_3311_Regression/Makefile tests/Bug_3315_Regression/Makefile + tests/Bug_3321_Regression/Makefile tests/Bug_933_Regression/Makefile tests/CDR/Makefile tests/COIOP/Makefile diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am index f7c3b93780c..e83cda4db38 100644 --- a/TAO/orbsvcs/Fault_Notifier/Makefile.am +++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am @@ -31,8 +31,6 @@ Fault_Notifier_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 Fault_Notifier_SOURCES = \ @@ -43,7 +41,7 @@ Fault_Notifier_SOURCES = \ Fault_Notifier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am index 178633ca9f8..107b0ec0130 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am @@ -26,9 +26,7 @@ Basic_Logging_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include + -I$(TAO_BUILDDIR)/orbsvcs Basic_Logging_Service_SOURCES = \ Basic_Logging_Server.cpp \ @@ -41,7 +39,7 @@ 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)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am index 959dd8c703f..71ba73190cf 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am @@ -28,8 +28,6 @@ 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 = \ @@ -48,7 +46,7 @@ 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)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am index f49bbfb5748..5d8828a0b45 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am @@ -27,8 +27,6 @@ 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 = \ @@ -44,7 +42,7 @@ 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)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index 857d099b546..0184deed0a6 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -28,9 +28,7 @@ RTEvent_Logging_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include + -I$(TAO_BUILDDIR)/orbsvcs RTEvent_Logging_Service_SOURCES = \ RTEvent_Logging_Server.cpp \ @@ -43,7 +41,7 @@ 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)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am index 80b9cb43cdf..cca6bb555de 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile.am +++ b/TAO/orbsvcs/Notify_Service/Makefile.am @@ -30,8 +30,6 @@ NT_Notify_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 NT_Notify_Service_SOURCES = \ @@ -46,7 +44,7 @@ NT_Notify_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -77,8 +75,6 @@ Notify_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_Service_SOURCES = \ @@ -91,7 +87,7 @@ Notify_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am index a78f37bc9b4..d9555ab6c85 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am @@ -30,8 +30,6 @@ agent_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(srcdir)/.. \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -55,7 +53,7 @@ agent_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am index 8f454297640..de5242958e0 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am @@ -30,8 +30,6 @@ craft_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(srcdir)/.. \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -55,7 +53,7 @@ craft_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am index 8ba48c23e08..881d31d0ce2 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am @@ -30,8 +30,6 @@ Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -63,7 +61,7 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -94,8 +92,6 @@ Supplier_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 Supplier_SOURCES = \ @@ -114,7 +110,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am index 7f818d0d7f4..a88aa5f43aa 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am @@ -30,8 +30,6 @@ Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -64,7 +62,7 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -96,8 +94,6 @@ Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -130,7 +126,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 66daeb63b4c..d7dd1b5b472 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -2125,8 +2125,6 @@ libTAO_CosNotification_Serv_la_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 \ -DTAO_NOTIFY_SERV_BUILD_DLL @@ -2218,7 +2216,7 @@ libTAO_CosNotification_Serv_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNotification_Serv_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -2395,8 +2393,6 @@ libTAO_CosNotification_MC_Ext_la_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 \ -DTAO_NOTIFY_MC_EXT_BUILD_DLL @@ -2420,7 +2416,7 @@ libTAO_CosNotification_MC_Ext_la_LIBADD = \ libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ libTAO_CosNotification_Skel.la \ @@ -2453,6 +2449,7 @@ endif BUILD_EXCEPTIONS if BUILD_ACEXML if BUILD_EXCEPTIONS +if BUILD_ZLIB if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_CosNotification_Persist.la @@ -2464,19 +2461,11 @@ libTAO_CosNotification_Persist_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(ACE_ROOT)/ACEXML/common \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_NOTIFY_PERSIST_BUILD_DLL - -if BUILD_ZLIB -if BUILD_ZZIP -libTAO_CosNotification_Persist_la_CPPFLAGS += \ $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB + $(ACE_ZLIB_CPPFLAGS) \ + -DTAO_NOTIFY_PERSIST_BUILD_DLL libTAO_CosNotification_Persist_la_SOURCES = \ Notify/XML_Loader.cpp \ @@ -2484,15 +2473,7 @@ libTAO_CosNotification_Persist_la_SOURCES = \ Notify/XML_Topology_Factory.cpp libTAO_CosNotification_Persist_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -if BUILD_ZLIB -if BUILD_ZZIP -libTAO_CosNotification_Persist_la_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_ZZIP_LDFLAGS) $(ACE_ZLIB_LDFLAGS) libTAO_CosNotification_Persist_la_LIBADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ @@ -2500,7 +2481,7 @@ libTAO_CosNotification_Persist_la_LIBADD = \ libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ libTAO_CosNotification_Skel.la \ @@ -2511,15 +2492,9 @@ libTAO_CosNotification_Persist_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -libTAO_CosNotification_Persist_la_LIBADD += \ + $(ACE_BUILDDIR)/ace/libACE.la \ $(ACE_ZZIP_LIBS) \ $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB nobase_include_HEADERS += \ Notify/XML_Loader.h \ @@ -2528,6 +2503,7 @@ nobase_include_HEADERS += \ Notify/notify_persist_export.h endif !BUILD_ACE_FOR_TAO +endif BUILD_ZLIB endif BUILD_EXCEPTIONS endif BUILD_ACEXML @@ -3142,8 +3118,6 @@ libTAO_DsLogAdmin_Serv_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_LOG_SERV_BUILD_DLL libTAO_DsLogAdmin_Serv_la_SOURCES = \ @@ -3172,7 +3146,7 @@ libTAO_DsLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -3287,8 +3261,6 @@ libTAO_DsEventLogAdmin_Serv_la_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 \ -DTAO_EVENTLOG_SERV_BUILD_DLL @@ -3312,7 +3284,7 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -3505,8 +3477,6 @@ libTAO_DsNotifyLogAdmin_Serv_la_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 \ -DTAO_NOTIFYLOG_SERV_BUILD_DLL @@ -3525,7 +3495,7 @@ libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -5385,8 +5355,6 @@ libTAO_RTEventLogAdmin_Serv_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_RTEVENTLOG_SERV_BUILD_DLL libTAO_RTEventLogAdmin_Serv_la_SOURCES = \ @@ -5404,7 +5372,7 @@ libTAO_RTEventLogAdmin_Serv_la_LIBADD = \ libTAO_RTEvent_Serv.la \ libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -5585,8 +5553,6 @@ libTAO_RT_Notification_la_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 \ -DTAO_RT_NOTIFY_BUILD_DLL @@ -5605,7 +5571,7 @@ libTAO_RT_Notification_la_LIBADD = \ libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ libTAO_CosNotification_Skel.la \ diff --git a/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am index c8b488ac6f2..7ee7f0b5e7a 100644 --- a/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am @@ -52,8 +52,6 @@ server_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 server_SOURCES = \ @@ -66,7 +64,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am index b58e2a2350b..004410c7c11 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am @@ -26,9 +26,7 @@ client_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include + -I$(TAO_BUILDDIR)/orbsvcs client_SOURCES = \ Basic_Log_Test.cpp \ @@ -36,7 +34,7 @@ client_SOURCES = \ Basic_Log_Test.h client_LDADD = \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am index 11462bd1c68..19f235d8ea3 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am @@ -29,8 +29,6 @@ AdminProperties_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -54,7 +52,7 @@ AdminProperties_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -84,8 +82,6 @@ ConnectDisconnect_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -109,7 +105,7 @@ ConnectDisconnect_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -139,8 +135,6 @@ Events_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -164,7 +158,7 @@ Events_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -194,8 +188,6 @@ Filter_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -219,7 +211,7 @@ Filter_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -249,8 +241,6 @@ IdAssignment_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -274,7 +264,7 @@ IdAssignment_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -304,8 +294,6 @@ LifeCycle_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -329,7 +317,7 @@ LifeCycle_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -359,8 +347,6 @@ MultiTypes_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -384,7 +370,7 @@ MultiTypes_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -414,8 +400,6 @@ Sequence_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -439,7 +423,7 @@ Sequence_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -469,8 +453,6 @@ Simple_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -494,7 +476,7 @@ Simple_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -524,8 +506,6 @@ Updates_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -549,7 +529,7 @@ Updates_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am index 09e5df05589..43871e871cc 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am @@ -60,8 +60,6 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -87,7 +85,7 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -117,8 +115,6 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -144,7 +140,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am index 14fae239fa6..763faa5e880 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am @@ -60,8 +60,6 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -87,7 +85,7 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -117,8 +115,6 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -144,7 +140,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am index e4bc4555b0b..1e2dd234c34 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am @@ -60,8 +60,6 @@ Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -87,7 +85,7 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -117,8 +115,6 @@ Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -144,7 +140,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am index eac5abd8b55..3b0cea80a90 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am @@ -51,8 +51,6 @@ server_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 server_SOURCES = \ @@ -65,7 +63,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am index 64d520f2914..0b722e2d475 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am @@ -28,8 +28,6 @@ Notify_Tests_Destroy_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -53,7 +51,7 @@ Notify_Tests_Destroy_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am index cda410e46be..1639c14a104 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am @@ -60,8 +60,6 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -87,7 +85,7 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -117,8 +115,6 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -145,7 +141,7 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -175,8 +171,6 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -202,7 +196,7 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -232,8 +226,6 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -260,7 +252,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am index 3863d8c0183..e34669e2e5e 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am @@ -28,8 +28,6 @@ Notify_Tests_Driver_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -52,7 +50,7 @@ Notify_Tests_Driver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/MC/Makefile.am b/TAO/orbsvcs/tests/Notify/MC/Makefile.am index 3b44cf10e74..098be3c494c 100644 --- a/TAO/orbsvcs/tests/Notify/MC/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/MC/Makefile.am @@ -60,8 +60,6 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -87,7 +85,7 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -116,8 +114,6 @@ test_monitor_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 test_monitor_SOURCES = \ @@ -134,7 +130,7 @@ test_monitor_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -163,8 +159,6 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -189,7 +183,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am index edfb4aaef7e..386e40806c0 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am @@ -65,8 +65,6 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -92,7 +90,7 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -124,8 +122,6 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -151,7 +147,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am index 3886cb79e6d..01f52381947 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am @@ -60,8 +60,6 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -87,7 +85,7 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -117,8 +115,6 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -145,7 +141,7 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -175,8 +171,6 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -202,7 +196,7 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -232,8 +226,6 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -260,7 +252,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/Makefile.am b/TAO/orbsvcs/tests/Notify/Persistent_POA/Makefile.am index fe67fb7daec..e17e8f7ba95 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_POA/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/Makefile.am @@ -55,8 +55,6 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -85,7 +83,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am index 45c14059a85..4760078a202 100644 --- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am @@ -28,8 +28,6 @@ libNotifyPlugTop_la_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 \ -DPLUGTOP_BUILD_DLL @@ -58,8 +56,6 @@ main_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 main_SOURCES = \ @@ -69,7 +65,7 @@ main_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am index 8a5be4f7a42..1c565445f95 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am @@ -29,8 +29,6 @@ libTAO_RT_NotifyTests_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am index aedd543cd40..fea25e761a2 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am @@ -29,8 +29,6 @@ Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -54,7 +52,7 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -84,8 +82,6 @@ Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -109,7 +105,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am index 19cd0ef0349..b4cc2d8e309 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am @@ -65,8 +65,6 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -92,7 +90,7 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -124,8 +122,6 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -151,7 +147,7 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am index 16eee9d0c0f..84af962bf8d 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am @@ -60,8 +60,6 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -87,7 +85,7 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -117,8 +115,6 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -144,7 +140,7 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am index 879290a35a3..8b5abec49c6 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am @@ -60,8 +60,6 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -87,7 +85,7 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -117,8 +115,6 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -144,7 +140,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am index acd7f2f15de..70ef55a747c 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am @@ -60,8 +60,6 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -87,7 +85,7 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -117,8 +115,6 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -145,7 +141,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am index 7f6f03e3360..a02868bb942 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am @@ -28,8 +28,6 @@ libTAO_RT_NotifyTests_Filter_la_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 \ -DTAO_RT_Test_Filter_BUILD_DLL diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am index b3693178696..ea6e19e65b1 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am @@ -28,8 +28,6 @@ main_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 main_SOURCES = \ @@ -39,7 +37,7 @@ main_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am index a67fc325034..014b47352ce 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am @@ -54,8 +54,6 @@ libTAO_NotifyTests_la_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 \ -DTAO_NOTIFY_TEST_BUILD_DLL diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am index 453ff74d529..d70cd46d405 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am @@ -60,8 +60,6 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -87,7 +85,7 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -117,8 +115,6 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -145,7 +141,7 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -175,8 +171,6 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -202,7 +196,7 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -232,8 +226,6 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -260,7 +252,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am index c0fec795d30..d0ee8a5cb74 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am @@ -28,8 +28,6 @@ RedGreen_Test_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -54,7 +52,7 @@ RedGreen_Test_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am index ebe749bdb42..201e70546db 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am @@ -28,8 +28,6 @@ Throughput_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -54,7 +52,7 @@ Throughput_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am index 06d67003c86..814733224f6 100644 --- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am +++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am @@ -27,8 +27,6 @@ MonitorControlExt_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 MonitorControlExt_SOURCES = \ @@ -42,7 +40,7 @@ MonitorControlExt_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ diff --git a/TAO/tao/ETCL/Makefile.am b/TAO/tao/ETCL/Makefile.am index cca6aba6173..71396575b51 100644 --- a/TAO/tao/ETCL/Makefile.am +++ b/TAO/tao/ETCL/Makefile.am @@ -16,13 +16,12 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) -lib_LTLIBRARIES = ## Makefile.TAO_ETCL.am if BUILD_EXCEPTIONS -lib_LTLIBRARIES += libTAO_ETCL.la +lib_LTLIBRARIES = libTAO_ETCL.la libTAO_ETCL_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -39,8 +38,6 @@ libTAO_ETCL_la_LDFLAGS = \ libTAO_ETCL_la_LIBADD = \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -65,45 +62,6 @@ EXTRA_DIST = \ TAO_ETCL.pc.in -## Makefile.TAO_ETCL_Parser.am - -if BUILD_EXCEPTIONS - -lib_LTLIBRARIES += libTAO_ETCL_Parser.la - -libTAO_ETCL_Parser_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ - -DTAO_ETCL_PARSER_BUILD_DLL - -libTAO_ETCL_Parser_la_SOURCES = \ - ETCL_Interpreter.cpp \ - ETCL_l.cpp \ - ETCL_y.cpp - -libTAO_ETCL_Parser_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_ETCL_Parser_la_LIBADD = \ - libTAO_ETCL.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - $(ACE_ROOT)/ace/ETCL/ETCL_Interpreter.h \ - $(ACE_ROOT)/ace/ETCL/ETCL_y.h \ - $(TAO_ROOT)/tao/ETCL/ETCL_include/ETCL_include.h \ - $(TAO_ROOT)/tao/ETCL/ETCL_include/ETCL_macros.h \ - $(TAO_ROOT)/tao/ETCL/ETCL_include/etcl_parser_export.h \ - TAO_ETCL_Constraint.inl - -endif BUILD_EXCEPTIONS - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index a25fbf5c56b..800d7f23668 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -5942,7 +5942,6 @@ libTAO_Monitor_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(ACE_ROOT)/ace/ETCL/ETCL_include \ -DTAO_MONITOR_BUILD_DLL libTAO_Monitor_la_SOURCES = \ @@ -6418,8 +6417,7 @@ libTAO_ZlibCompressor_la_SOURCES = \ Compression/zlib/ZlibCompressor_Factory.cpp libTAO_ZlibCompressor_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ \ - $(ACE_ZLIB_LDFLAGS) + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_ZLIB_LDFLAGS) libTAO_ZlibCompressor_la_LIBADD = \ libTAO_Compression.la \ diff --git a/TAO/tao/ZlibCompressor.mpc b/TAO/tao/ZlibCompressor.mpc index 53f426d4926..797c1feccb7 100644 --- a/TAO/tao/ZlibCompressor.mpc +++ b/TAO/tao/ZlibCompressor.mpc @@ -1,5 +1,5 @@ //$Id$ -project(ZlibCompressor) : taolib, tao_output, install, compression, tao_versioning_idl_defaults, zlib { +project(ZlibCompressor) : taolib, tao_output, install, compression, tao_versioning_idl_defaults, ace_zlib { requires += zlib sharedname = TAO_ZlibCompressor dynamicflags = TAO_ZLIBCOMPRESSOR_BUILD_DLL diff --git a/TAO/tests/Bug_3321_Regression/Makefile.am b/TAO/tests/Bug_3321_Regression/Makefile.am new file mode 100644 index 00000000000..e540e000dd3 --- /dev/null +++ b/TAO/tests/Bug_3321_Regression/Makefile.am @@ -0,0 +1,48 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + + +## Makefile.Bug_3321_Regression.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + main.cpp + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Compression/Makefile.am b/TAO/tests/Compression/Makefile.am index d0de519a423..91112abd666 100644 --- a/TAO/tests/Compression/Makefile.am +++ b/TAO/tests/Compression/Makefile.am @@ -32,7 +32,7 @@ server_SOURCES = \ server.cpp server_LDFLAGS = \ - $(ACE_ZLIB_LDFLAGS) + $(ACE_ZLIB_LDFLAGS) server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_ZlibCompressor.la \ diff --git a/TAO/tests/Makefile.am b/TAO/tests/Makefile.am index bfe6ebbeedc..8a6dca8f228 100644 --- a/TAO/tests/Makefile.am +++ b/TAO/tests/Makefile.am @@ -121,6 +121,7 @@ SUBDIRS = \ Bug_3299_Regression \ Bug_3311_Regression \ Bug_3315_Regression \ + Bug_3321_Regression \ Bug_933_Regression \ CDR \ COIOP \ diff --git a/TAO/tests/Monitor/Marshal_Buffer/Makefile.am b/TAO/tests/Monitor/Marshal_Buffer/Makefile.am index 92d7abc11f0..f48df95ed1b 100644 --- a/TAO/tests/Monitor/Marshal_Buffer/Makefile.am +++ b/TAO/tests/Monitor/Marshal_Buffer/Makefile.am @@ -57,10 +57,7 @@ client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ - -I$(ACE_ROOT)/ace/ETCL/ETCL_include + -I$(TAO_BUILDDIR) client_SOURCES = \ client.cpp \ @@ -72,7 +69,6 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \ $(ACE_BUILDDIR)/ace/MonitorControl/libACE_MonitorControl.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.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_PortableServer.la \ diff --git a/TAO/utils/monitor/Makefile.am b/TAO/utils/monitor/Makefile.am index 3f1fbdbc106..4c1b5b3ce31 100644 --- a/TAO/utils/monitor/Makefile.am +++ b/TAO/utils/monitor/Makefile.am @@ -25,10 +25,7 @@ monitor_client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ - -I$(ACE_ROOT)/ace/ETCL/ETCL_include + -I$(TAO_BUILDDIR) monitor_client_SOURCES = \ monitor_client.cpp @@ -40,7 +37,6 @@ monitor_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \ $(ACE_BUILDDIR)/ace/MonitorControl/libACE_MonitorControl.la \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.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_PortableServer.la \ |