diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-15 14:57:37 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-15 14:57:37 +0000 |
| commit | b4d0d98acab13b9f7469ab2d02e1735256974045 (patch) | |
| tree | 1e3a3c20c2b7c78465f9f7a258357a961bfd361b /TAO/orbsvcs/tests/Notify | |
| parent | 7a54cdf86705c08a738a11f5fa4982adc67be6f3 (diff) | |
| download | ATCD-b4d0d98acab13b9f7469ab2d02e1735256974045.tar.gz | |
ChangeLogTag: Tue Nov 15 06:56:51 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/tests/Notify')
17 files changed, 360 insertions, 2 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am index ced1d9899e8..4d878262ef6 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.Basic_Notify_AdminProperties.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += AdminProperties @@ -37,6 +38,13 @@ AdminProperties_SOURCES = \ AdminProperties_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -52,9 +60,11 @@ AdminProperties_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_ConnectDisconnect.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ConnectDisconnect @@ -75,6 +85,13 @@ ConnectDisconnect_SOURCES = \ ConnectDisconnect_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -90,9 +107,11 @@ ConnectDisconnect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Events.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Events @@ -113,6 +132,13 @@ Events_SOURCES = \ Events_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -128,9 +154,11 @@ Events_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Filter.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Filter @@ -151,6 +179,13 @@ Filter_SOURCES = \ Filter_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -166,9 +201,11 @@ Filter_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_IdAssignment.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += IdAssignment @@ -189,6 +226,13 @@ IdAssignment_SOURCES = \ IdAssignment_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -204,9 +248,11 @@ IdAssignment_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_LifeCycle.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += LifeCycle @@ -227,6 +273,13 @@ LifeCycle_SOURCES = \ LifeCycle_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -242,9 +295,11 @@ LifeCycle_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_MultiTypes.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += MultiTypes @@ -265,6 +320,13 @@ MultiTypes_SOURCES = \ MultiTypes_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -280,9 +342,11 @@ MultiTypes_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Sequence.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence @@ -303,6 +367,13 @@ Sequence_SOURCES = \ Sequence_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -318,9 +389,11 @@ Sequence_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Simple.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Simple @@ -341,6 +414,13 @@ Simple_SOURCES = \ Simple_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -356,9 +436,11 @@ Simple_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Updates.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Updates @@ -379,6 +461,13 @@ Updates_SOURCES = \ Updates_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -394,6 +483,7 @@ Updates_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am index 099a4a73ecd..cc426743130 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Blocking_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -76,6 +77,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -91,9 +99,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Blocking_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -117,6 +127,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -132,6 +149,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am index 1e57ff1ede7..b9aa46216ab 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Test_Destroy.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Notify_Tests_Destroy @@ -36,6 +37,13 @@ Notify_Tests_Destroy_SOURCES = \ Notify_Tests_Destroy_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -51,6 +59,7 @@ Notify_Tests_Destroy_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am index eaac6e439f2..c00dcd34330 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Discarding_Ntf_Seq_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -76,6 +77,13 @@ Sequence_Consumer_SOURCES = \ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -91,9 +99,11 @@ Sequence_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Seq_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -118,6 +128,13 @@ Sequence_Supplier_SOURCES = \ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -133,9 +150,11 @@ Sequence_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -160,6 +179,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -175,9 +201,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -202,6 +230,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -217,6 +252,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am index 580883c71de..4840efbc367 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Test_Driver.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Notify_Tests_Driver @@ -35,6 +36,13 @@ Notify_Tests_Driver_SOURCES = \ Notify_Tests_Driver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -50,6 +58,7 @@ Notify_Tests_Driver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am index c3e7343081f..7ef15ddfbe9 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.MT_Dispatching_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -74,6 +75,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -89,9 +97,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.MT_Dispatching_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -114,6 +124,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -129,6 +146,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am index fb05b3d2936..d9a443da032 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Ordering_Ntf_Seq_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -76,6 +77,13 @@ Sequence_Consumer_SOURCES = \ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -91,9 +99,11 @@ Sequence_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Seq_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -118,6 +128,13 @@ Sequence_Supplier_SOURCES = \ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -133,9 +150,11 @@ Sequence_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -160,6 +179,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -175,9 +201,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -202,6 +230,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -217,6 +252,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am index acd2a5d29c0..d31cf7083d6 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RT_Notify_lib.am +if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA @@ -45,6 +46,7 @@ noinst_HEADERS = \ endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am index 5693bd22f7e..4ba90dc5b7e 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.Reconnecting_Consumer.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Consumer @@ -37,6 +38,13 @@ Consumer_SOURCES = \ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -52,9 +60,11 @@ Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Reconnecting_Supplier.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Supplier @@ -75,6 +85,13 @@ Supplier_SOURCES = \ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -90,6 +107,7 @@ Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: 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 137b9c7d10f..d83e414decb 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -76,6 +77,13 @@ Sequence_Consumer_SOURCES = \ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -91,9 +99,11 @@ Sequence_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -117,6 +127,13 @@ Sequence_Supplier_SOURCES = \ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -132,6 +149,7 @@ Sequence_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am index 77a4f7f2e40..bef774efa40 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Seq_Multi_Filter_Ntf_Seq_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -76,6 +77,13 @@ Sequence_Consumer_SOURCES = \ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -91,9 +99,11 @@ Sequence_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Seq_Multi_Filter_Ntf_Seq_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -117,6 +127,13 @@ Sequence_Supplier_SOURCES = \ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -132,6 +149,7 @@ Sequence_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am index bfd9e054fab..ca34e01a300 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Struct_Filter_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -74,6 +75,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -89,9 +97,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Struct_Filter_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -114,6 +124,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -129,6 +146,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am index 090ad0bb7c8..815e25bea24 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Struct_Multi_Filter_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -74,6 +75,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -89,9 +97,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Struct_Multi_Filter_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -115,6 +125,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -130,6 +147,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am index 0d4de28dd75..d4db0eb8ed4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.NotifyTests_Lib.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -168,6 +169,7 @@ noinst_HEADERS = \ notify_test_export.h endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am index 86c5c6c75e1..80d62c08529 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am @@ -56,6 +56,7 @@ endif !BUILD_MINIMUM_CORBA ## Makefile.Filter_Notify_Perf_Sequence_Consumer.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -80,6 +81,13 @@ Sequence_Consumer_SOURCES = \ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -95,9 +103,11 @@ Sequence_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Seq_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -122,6 +132,13 @@ Sequence_Supplier_SOURCES = \ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -137,9 +154,11 @@ Sequence_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -164,6 +183,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -179,9 +205,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -206,6 +234,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -221,6 +256,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am index 13325f1a783..a88a6cea3a2 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RedGreen_Ntf_Perf_RedGreen.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = RedGreen_Test @@ -37,6 +38,13 @@ RedGreen_Test_SOURCES = \ RedGreen_Test_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -52,6 +60,7 @@ RedGreen_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am index 45fd2b7c7b9..6fa40889e80 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am @@ -36,12 +36,15 @@ Throughput_SOURCES = \ Throughput.h Throughput_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ |