diff options
Diffstat (limited to 'TAO/orbsvcs/examples/Notify')
7 files changed, 24 insertions, 21 deletions
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am index ae1c7216075..935c00917ea 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am @@ -16,9 +16,9 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Agent.am +if BUILD_EXCEPTIONS if BUILD_THREADS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = agent @@ -42,6 +42,7 @@ agent_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -54,9 +55,9 @@ agent_LDADD = \ $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am index 30fdd5a97a3..c9e9ededc1a 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am @@ -16,9 +16,9 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Gate.am +if BUILD_EXCEPTIONS if BUILD_THREADS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libGate.la @@ -40,9 +40,9 @@ noinst_HEADERS = \ Export.h \ Gate.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am index dc08a9bae17..9cdce38bb28 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am @@ -16,9 +16,9 @@ TAO_ROOT = $(top_srcdir) ## Makefile.SpaceCraft.am +if BUILD_EXCEPTIONS if BUILD_THREADS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = craft @@ -42,6 +42,7 @@ craft_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -54,9 +55,9 @@ craft_LDADD = \ $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am index f7fb9130144..3a59bc4caa5 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Filter.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = main @@ -45,7 +45,7 @@ main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am index 3115e27c5f6..6ad63f1659c 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am @@ -18,8 +18,8 @@ noinst_PROGRAMS = ## Makefile.Notify_Lanes_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Consumer @@ -53,10 +53,10 @@ Consumer_LDADD = \ $(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 \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -68,14 +68,14 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Notify_Lanes_Supplier.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Supplier @@ -103,6 +103,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -117,8 +118,8 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am index fcbd47a2d9c..835ab5316c6 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Subscribe.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = Subscribe @@ -45,7 +45,7 @@ Subscribe_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am index 130c85fa5b5..39bee752b42 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am @@ -18,8 +18,8 @@ noinst_PROGRAMS = ## Makefile.Notify_ThreadPool_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Consumer @@ -50,7 +50,6 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ @@ -58,6 +57,7 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -69,15 +69,15 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Notify_ThreadPool_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Supplier @@ -108,7 +108,6 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ @@ -116,6 +115,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -127,8 +127,8 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. |