diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-09 13:03:50 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-09 13:03:50 +0000 |
| commit | ac607249a12b5b6fb3e42f095728189924e3e0a0 (patch) | |
| tree | e30bc4f48ff66c90b1fd4571ba4dfaf0dc8a2947 /TAO/orbsvcs | |
| parent | 88e7532fabbfaecedb81f70dc241570febbf2311 (diff) | |
| download | ATCD-ac607249a12b5b6fb3e42f095728189924e3e0a0.tar.gz | |
ChangeLogTag: Thu Nov 9 12:17:10 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs')
168 files changed, 1259 insertions, 727 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am index b0aae6c44ac..0114d113f00 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile.am +++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Concurrency_Service.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = Concurrency_Service Concurrency_Service_CPPFLAGS = \ @@ -42,6 +45,8 @@ Concurrency_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am index fe84d063565..6737aa7475b 100644 --- a/TAO/orbsvcs/CosEvent_Service/Makefile.am +++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEvent_Service.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS = CosEvent_Service @@ -51,7 +51,7 @@ CosEvent_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am index c286f12f251..c2aad327503 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile.am +++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Dump_Schedule.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = Dump_Schedule Dump_Schedule_CPPFLAGS = \ @@ -38,6 +41,8 @@ Dump_Schedule_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am index f5f934274fe..25223b729bd 100644 --- a/TAO/orbsvcs/Event_Service/Makefile.am +++ b/TAO/orbsvcs/Event_Service/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Event_Service.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO bin_PROGRAMS = Event_Service @@ -52,6 +53,7 @@ Event_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am index c5bdcdfdd92..e3f70a14015 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.FTRT_Event_Service.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrt_eventservice @@ -61,8 +61,8 @@ ftrt_eventservice_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am index 8c78feec083..8d6a8b7cb19 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrtec_factory_service @@ -60,9 +60,9 @@ ftrtec_factory_service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am index e7e12326fdc..9edc7551222 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrtec_gateway_service @@ -59,9 +59,9 @@ ftrtec_gateway_service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am index 1f7d9f4e065..a633d22b229 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am +++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libTAO_ReplicationManagerLib.la @@ -46,9 +46,9 @@ noinst_HEADERS = \ FT_FaultConsumer.h \ FT_FaultEventDescriptor.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -56,9 +56,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS = FT_ReplicationManager @@ -104,9 +104,9 @@ FT_ReplicationManager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am index a0033227cea..2250699135b 100644 --- a/TAO/orbsvcs/Fault_Detector/Makefile.am +++ b/TAO/orbsvcs/Fault_Detector/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS = Fault_Detector @@ -60,9 +60,9 @@ Fault_Detector_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am index 23e094d7a5b..f1a60459f6a 100644 --- a/TAO/orbsvcs/Fault_Notifier/Makefile.am +++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS = Fault_Notifier @@ -64,9 +64,9 @@ Fault_Notifier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am index af35aebcf86..6e818040b1d 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.am +++ b/TAO/orbsvcs/IFR_Service/Makefile.am @@ -17,8 +17,8 @@ bin_PROGRAMS = ## Makefile.IFR_Service.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += IFR_Service @@ -50,12 +50,12 @@ IFR_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.TAO_IFR_BE.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_LTLIBRARIES = libTAO_IFR_BE.la @@ -91,11 +91,11 @@ noinst_HEADERS = \ ifr_removing_visitor.h \ ifr_visitor.h -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.TAO_IFR_EXE.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS += tao_ifr @@ -107,6 +107,7 @@ tao_ifr_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs/IFR_Service \ -I$(TAO_ROOT)/TAO_IDL/include \ -I$(TAO_ROOT)/TAO_IDL/fe \ + -I$TAO_ROOT \ -DTAO_IDL_INCLUDE_DIR="\"$(includedir)/tao\"" tao_ifr_SOURCES = \ @@ -123,7 +124,7 @@ tao_ifr_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/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am index 166dacc12a0..0bfcff9c810 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am @@ -16,11 +16,17 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_LTLIBRARIES = +CLEANFILES = +BUILT_SOURCES = bin_PROGRAMS = +noinst_HEADERS = ## Makefile.ImR_Activator_IDL.am -BUILT_SOURCES = \ +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ ImR_ActivatorC.cpp \ ImR_ActivatorC.h \ ImR_ActivatorC.inl \ @@ -31,7 +37,7 @@ BUILT_SOURCES = \ ImR_ActivatorS_T.h \ ImR_ActivatorS_T.inl -CLEANFILES = \ +CLEANFILES += \ ImR_Activator-stamp \ ImR_ActivatorC.cpp \ ImR_ActivatorC.h \ @@ -49,7 +55,7 @@ ImR_Activator-stamp: $(srcdir)/ImR_Activator.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl @touch $@ -noinst_LTLIBRARIES = libTAO_ImR_Activator_IDL.la +noinst_LTLIBRARIES += libTAO_ImR_Activator_IDL.la libTAO_ImR_Activator_IDL_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -64,7 +70,7 @@ libTAO_ImR_Activator_IDL_la_SOURCES = \ ImR_ActivatorC.cpp \ ImR_ActivatorS.cpp -noinst_HEADERS = \ +noinst_HEADERS += \ ImR_Activator.idl \ ImR_ActivatorC.h \ ImR_ActivatorC.inl \ @@ -75,9 +81,12 @@ noinst_HEADERS = \ ImR_ActivatorS_T.inl \ activator_idl_export.h +endif BUILD_EXCEPTIONS + ## Makefile.ImR_Locator_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES += \ ImR_LocatorC.cpp \ @@ -173,14 +182,15 @@ noinst_HEADERS += \ ImR_LocatorS_T.inl \ locator_idl_export.h +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ImR_Activator.am if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES += libTAO_ImR_Activator.la @@ -205,8 +215,8 @@ noinst_HEADERS += \ ImR_Activator_i.h \ activator_export.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -214,8 +224,8 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += ImR_Activator @@ -250,8 +260,8 @@ ImR_Activator_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -259,8 +269,8 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES += libTAO_ImR_Locator.la @@ -304,8 +314,8 @@ noinst_HEADERS += \ locator_export.h \ utils.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -313,8 +323,8 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += ImplRepo_Service @@ -351,14 +361,14 @@ ImplRepo_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML ## Makefile.tao_imr.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS += tao_imr @@ -380,7 +390,7 @@ tao_imr_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/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am index 1a997b187d7..128cf5a28eb 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.LifeCycle_Service.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = LifeCycle_Service @@ -46,6 +46,7 @@ LifeCycle_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \ @@ -55,7 +56,7 @@ LifeCycle_Service_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/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am index 4956f9d2aa2..d3634c76188 100644 --- a/TAO/orbsvcs/LoadBalancer/Makefile.am +++ b/TAO/orbsvcs/LoadBalancer/Makefile.am @@ -19,8 +19,8 @@ bin_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += LoadManager @@ -55,8 +55,8 @@ LoadManager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -64,8 +64,8 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += LoadMonitor @@ -103,8 +103,8 @@ LoadMonitor_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am index 1d5584d36e0..9ce456829f5 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Basic_Logging_Service.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = Basic_Logging_Service Basic_Logging_Service_CPPFLAGS = \ @@ -31,7 +34,6 @@ Basic_Logging_Service_SOURCES = \ Basic_Logging_Service.h Basic_Logging_Service_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -39,6 +41,7 @@ Basic_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ @@ -48,6 +51,8 @@ Basic_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am index fcc727eb83c..496279e6e66 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Event_Logging_Service.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS = Event_Logging_Service @@ -41,7 +41,6 @@ Event_Logging_Service_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_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -49,6 +48,7 @@ Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ @@ -62,7 +62,7 @@ Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am index 42c6388bae0..b4bf6750025 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Logging_Service.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS = Notify_Logging_Service @@ -35,7 +35,6 @@ Notify_Logging_Service_SOURCES = \ Notify_Logging_Service.h Notify_Logging_Service_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ @@ -45,6 +44,7 @@ Notify_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \ @@ -62,7 +62,7 @@ Notify_Logging_Service_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/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index bc87d82f809..48b9b71b8a9 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RTEvent_Logging_Service.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO bin_PROGRAMS = RTEvent_Logging_Service @@ -60,6 +61,7 @@ RTEvent_Logging_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am index dc236ad3e21..6f2a041e59d 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.am +++ b/TAO/orbsvcs/Naming_Service/Makefile.am @@ -17,6 +17,7 @@ bin_PROGRAMS = ## Makefile.NT_Naming_Service.am +if BUILD_EXCEPTIONS if BUILD_WINNT if !BUILD_ACE_FOR_TAO @@ -54,9 +55,11 @@ NT_Naming_Service_LDADD = \ endif !BUILD_ACE_FOR_TAO endif BUILD_WINNT +endif BUILD_EXCEPTIONS ## Makefile.Naming_Service.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO bin_PROGRAMS += Naming_Service @@ -91,6 +94,7 @@ Naming_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am index c7da6212cb3..0be14c12f78 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile.am +++ b/TAO/orbsvcs/Notify_Service/Makefile.am @@ -17,9 +17,9 @@ bin_PROGRAMS = ## Makefile.NT_Notify_Service.am +if BUILD_EXCEPTIONS if BUILD_WINNT if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += NT_Notify_Service @@ -56,13 +56,13 @@ NT_Notify_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_WINNT +endif BUILD_EXCEPTIONS ## Makefile.Notify_Service.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS += Notify_Service @@ -97,7 +97,7 @@ Notify_Service_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/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am index bb32c5e219f..45042fd7326 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile.am +++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Scheduling_Service.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = Scheduling_Service Scheduling_Service_CPPFLAGS = \ @@ -42,6 +45,8 @@ Scheduling_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/TAO_Service/Makefile.am b/TAO/orbsvcs/TAO_Service/Makefile.am index 22bb2e9a651..2542a4b66ca 100644 --- a/TAO/orbsvcs/TAO_Service/Makefile.am +++ b/TAO/orbsvcs/TAO_Service/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.TAO_Service.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = TAO_Service TAO_Service_CPPFLAGS = \ @@ -30,6 +33,8 @@ TAO_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am index 474b5debdad..e02048202f8 100644 --- a/TAO/orbsvcs/Time_Service/Makefile.am +++ b/TAO/orbsvcs/Time_Service/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +bin_PROGRAMS = + ## Makefile.Time_Service_Clerk.am -bin_PROGRAMS = Time_Service_Clerk +if BUILD_EXCEPTIONS + +bin_PROGRAMS += Time_Service_Clerk Time_Service_Clerk_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -42,8 +46,12 @@ Time_Service_Clerk_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Time_Service_Server.am +if BUILD_EXCEPTIONS + bin_PROGRAMS += Time_Service_Server Time_Service_Server_CPPFLAGS = \ @@ -71,6 +79,8 @@ Time_Service_Server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am index 611a96415c7..9ee7edd0fd5 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile.am +++ b/TAO/orbsvcs/Trading_Service/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Trading_Service.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = Trading_Service Trading_Service_CPPFLAGS = \ @@ -35,6 +38,7 @@ Trading_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -46,6 +50,8 @@ Trading_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am index 9eeb947e9d0..2894f41bdad 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am @@ -20,6 +20,8 @@ noinst_PROGRAMS = ## Makefile.CosEC_Factory_Idl.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ CosEventChannelFactoryC.cpp \ CosEventChannelFactoryC.h \ @@ -53,9 +55,11 @@ CosEventChannelFactory-stamp: $(srcdir)/CosEventChannelFactory.idl $(TAO_IDL_DEP noinst_HEADERS = \ CosEventChannelFactory.idl +endif BUILD_EXCEPTIONS + ## Makefile.CosEC_Factory_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += FactoryClient @@ -83,12 +87,12 @@ FactoryClient_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.CosEC_Factory_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += FactoryServer @@ -127,7 +131,7 @@ FactoryServer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am index 74f7f1dd02d..ddad451d99e 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEC_RtEC_Based_bin.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = RtEC_Based_CosEC @@ -36,6 +36,15 @@ RtEC_Based_CosEC_SOURCES = \ RtEC_Based_CosEC.cpp \ RtEC_Based_CosEC.h +../lib: + mkdir -p ../lib + +RtEC_Based_CosEC_DEPENDENCIES = \ + ../lib + +RtEC_Based_CosEC_LDFLAGS = \ + -L../lib + RtEC_Based_CosEC_LDADD = \ $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -54,8 +63,8 @@ RtEC_Based_CosEC_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am index fd3d67b82b3..935d64c4837 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEC_RtEC_Based_lib.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libCosEC_RtEC_Based.la @@ -49,8 +49,8 @@ noinst_HEADERS = \ SupplierAdmin_i.h \ rtec_cosec_export.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am index cd377c8edb7..e1bbcb35134 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEC_RtEC_Based_Tests_Basic_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Basic @@ -40,6 +40,15 @@ Basic_SOURCES = \ Consumer.h \ Supplier.h +../../lib: + mkdir -p ../../lib + +Basic_DEPENDENCIES = \ + ../../lib + +Basic_LDFLAGS = \ + -L../../lib + Basic_LDADD = \ $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ @@ -59,8 +68,8 @@ Basic_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am index 40a10fb6254..4b4827803d6 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am @@ -18,8 +18,8 @@ noinst_PROGRAMS = ## Makefile.CosEC_RtEC_Based_Mult_Cons.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Consumer @@ -39,6 +39,15 @@ Consumer_SOURCES = \ Consumer.h \ Multiple.h +../../lib: + mkdir -p ../../lib + +Consumer_DEPENDENCIES = \ + ../../lib + +Consumer_LDFLAGS = \ + -L../../lib + Consumer_LDADD = \ $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ @@ -58,15 +67,15 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEC_RtEC_Based_Mult_Supp.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Supplier @@ -86,6 +95,15 @@ Supplier_SOURCES = \ Multiple.h \ Supplier.h +../../lib: + mkdir -p ../../lib + +Supplier_DEPENDENCIES = \ + ../../lib + +Supplier_LDFLAGS = \ + -L../../lib + Supplier_LDADD = \ $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ @@ -105,8 +123,8 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am index 9938d9c430d..56b28bf2e51 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am @@ -17,7 +17,7 @@ noinst_PROGRAMS = ## Makefile.CosEC_Simple_Consumer.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Consumer @@ -42,12 +42,12 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.CosEC_Simple_Service.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Service @@ -82,12 +82,12 @@ Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEC_Simple_Supplier.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Supplier @@ -112,7 +112,7 @@ Supplier_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/CosEC/TypedSimple/Makefile.am b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am index 615cd3440e0..cdeaf1f73d1 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am @@ -21,7 +21,7 @@ noinst_PROGRAMS = ## Makefile.CosEC_TypedSimple_Consumer.am if BUILD_EC_TYPED_EVENTS -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ CountryC.cpp \ @@ -85,13 +85,13 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_EC_TYPED_EVENTS ## Makefile.CosEC_TypedSimple_Supplier.am if BUILD_EC_TYPED_EVENTS -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Supplier @@ -118,7 +118,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_EC_TYPED_EVENTS ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am index a25dd5aeef2..ac821798134 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am @@ -54,7 +54,6 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -99,7 +98,6 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS @@ -114,7 +112,6 @@ if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_THREADS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -162,7 +159,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS endif BUILD_INTERCEPTORS diff --git a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am index b4b3d851ccb..9fe1648da4b 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am +++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am @@ -20,6 +20,8 @@ noinst_PROGRAMS = ## Makefile.LoadBalancing_Idl.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ TestC.cpp \ TestC.h \ @@ -47,8 +49,11 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif BUILD_EXCEPTIONS + ## Makefile.LoadBalancing_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -75,6 +80,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.LoadBalancing_Server.am @@ -82,7 +88,6 @@ if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -126,7 +131,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/examples/Log/Basic/Makefile.am b/TAO/orbsvcs/examples/Log/Basic/Makefile.am index 9d3b10cddcc..92993ed47be 100644 --- a/TAO/orbsvcs/examples/Log/Basic/Makefile.am +++ b/TAO/orbsvcs/examples/Log/Basic/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Log_Basic_Client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -37,6 +40,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/examples/Log/Event/Makefile.am b/TAO/orbsvcs/examples/Log/Event/Makefile.am index 5fad8b3b991..6831d46ad68 100644 --- a/TAO/orbsvcs/examples/Log/Event/Makefile.am +++ b/TAO/orbsvcs/examples/Log/Event/Makefile.am @@ -17,7 +17,7 @@ noinst_PROGRAMS = ## Makefile.Log_Event_Consumer.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Event_Consumer @@ -45,11 +45,11 @@ Event_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Log_Event_Supplier.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Event_Supplier @@ -77,7 +77,7 @@ Event_Supplier_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/Log/Notify/Makefile.am b/TAO/orbsvcs/examples/Log/Notify/Makefile.am index 46d235ac030..8b017bd306b 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Makefile.am +++ b/TAO/orbsvcs/examples/Log/Notify/Makefile.am @@ -17,7 +17,7 @@ noinst_PROGRAMS = ## Makefile.Log_Notify_Consumer.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Notify_Consumer @@ -48,11 +48,11 @@ Notify_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Log_Notify_Supplier.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Notify_Supplier @@ -83,7 +83,7 @@ Notify_Supplier_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/Log/RTEvent/Makefile.am b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am index 0c83282a06d..1ce694a3599 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am +++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Log_RTEvent_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += RTEvent_Consumer @@ -49,11 +50,13 @@ RTEvent_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Log_RTEvent_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += RTEvent_Supplier @@ -85,6 +88,7 @@ RTEvent_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. 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. diff --git a/TAO/orbsvcs/examples/ORT/Makefile.am b/TAO/orbsvcs/examples/ORT/Makefile.am index 03e2618d646..c13121abb73 100644 --- a/TAO/orbsvcs/examples/ORT/Makefile.am +++ b/TAO/orbsvcs/examples/ORT/Makefile.am @@ -16,15 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -CLEANFILES = noinst_PROGRAMS = -BUILT_SOURCES = ## Makefile.ORT_Idl.am -if !BUILD_MINIMUM_CORBA - -BUILT_SOURCES += \ +BUILT_SOURCES = \ GatewayC.cpp \ GatewayC.h \ GatewayC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ GatewayS.h \ GatewayS.inl -CLEANFILES += \ +CLEANFILES = \ Gateway-stamp \ GatewayC.cpp \ GatewayC.h \ @@ -99,12 +95,10 @@ noinst_HEADERS = \ ObjectReferenceFactory.idl \ sum_server.idl -endif !BUILD_MINIMUM_CORBA - ## Makefile.ORT_Gateway.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += gateway_server @@ -135,13 +129,13 @@ gateway_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ORT_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -180,12 +174,12 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ORT_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -214,7 +208,7 @@ client_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/RtEC/IIOPGateway/Makefile.am b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am index 73c1ace16cb..d8d324ba722 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.RtEC_IIOPGateway.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Gateway @@ -50,11 +51,13 @@ Gateway_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_IIOPGateway_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Consumer @@ -84,11 +87,13 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_IIOPGateway_EC.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += EC @@ -121,11 +126,13 @@ EC_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_IIOPGateway_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Supplier @@ -155,6 +162,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am index f2e00e44bc0..195a3b0239a 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RtECKokyu.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = Service @@ -56,6 +57,7 @@ Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am index 48805140016..e13f9e380cc 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RtEC_MCast.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = MCast @@ -55,6 +56,7 @@ MCast_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am index 84401da731f..7c89f896172 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RtEC_Schedule.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = Service @@ -54,6 +55,7 @@ Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am index d9066e3eddc..72a249d8995 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.RtEC_Simple_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Consumer @@ -47,11 +48,13 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_Simple_Service.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Service @@ -85,11 +88,13 @@ Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_Simple_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Supplier @@ -119,6 +124,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am index a3e19081ec6..2834472db17 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am +++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Security_Send_File_Idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Security_Send_File_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -67,8 +71,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Security_Send_File_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -91,6 +99,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 21bfca9d7c9..50020177928 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ..\bin\mwc.pl -type automake -noreldefs TAO.mwc +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc includedir = @includedir@/orbsvcs pkgconfigdir = @libdir@/pkgconfig @@ -19,10 +19,16 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +lib_LTLIBRARIES = +pkgconfig_DATA = +CLEANFILES = +BUILT_SOURCES = ## Makefile.CosNaming_IDL.am -BUILT_SOURCES = \ +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ CosNamingC.cpp \ CosNamingC.h \ CosNamingC.inl \ @@ -33,7 +39,7 @@ BUILT_SOURCES = \ CosNamingS_T.h \ CosNamingS_T.inl -CLEANFILES = \ +CLEANFILES += \ CosNaming-stamp \ CosNamingC.cpp \ CosNamingC.h \ @@ -49,15 +55,19 @@ CosNamingC.cpp CosNamingC.h CosNamingC.inl CosNamingS.cpp CosNamingS.h CosNaming CosNaming-stamp: $(srcdir)/CosNaming.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl - @touch "$@" + @touch $@ nobase_include_HEADERS = \ CosNaming.idl +endif BUILD_EXCEPTIONS + ## Makefile.CosNaming.am -lib_LTLIBRARIES = libTAO_CosNaming.la +if BUILD_EXCEPTIONS + +lib_LTLIBRARIES += libTAO_CosNaming.la libTAO_CosNaming_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -73,7 +83,7 @@ libTAO_CosNaming_la_SOURCES = \ Naming/Naming_Client.cpp libTAO_CosNaming_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNaming_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -86,14 +96,16 @@ nobase_include_HEADERS += \ Naming/Naming_Client.h \ Naming/naming_export.h -pkgconfig_DATA = \ +pkgconfig_DATA += \ TAO_CosNaming.pc CLEANFILES += \ TAO_CosNaming.pc TAO_CosNaming.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNaming.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST = \ CosNaming.rc \ @@ -102,6 +114,8 @@ EXTRA_DIST = \ ## Makefile.CosProperty_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ CosPropertyC.cpp \ CosPropertyC.h \ @@ -129,7 +143,7 @@ CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosProperty-stamp: $(srcdir)/CosProperty.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosPropertyServiceC.cpp \ @@ -158,15 +172,19 @@ CosPropertyServiceC.cpp CosPropertyServiceC.h CosPropertyServiceC.inl CosPropert CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ CosProperty.idl \ CosPropertyService.idl +endif BUILD_EXCEPTIONS + ## Makefile.CosProperty.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosProperty.la libTAO_CosProperty_la_CPPFLAGS = \ @@ -183,7 +201,7 @@ libTAO_CosProperty_la_SOURCES = \ CosPropertyServiceC.cpp libTAO_CosProperty_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosProperty_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -204,7 +222,9 @@ CLEANFILES += \ TAO_CosProperty.pc TAO_CosProperty.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosProperty.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_CosProperty.pc.in @@ -212,6 +232,8 @@ EXTRA_DIST += \ ## Makefile.CosProperty_Skel.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosProperty_Skel.la libTAO_CosProperty_Skel_la_CPPFLAGS = \ @@ -228,7 +250,7 @@ libTAO_CosProperty_Skel_la_SOURCES = \ CosPropertyServiceS.cpp libTAO_CosProperty_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosProperty_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -257,7 +279,9 @@ CLEANFILES += \ TAO_CosProperty_Skel.pc TAO_CosProperty_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosProperty_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Skel.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_CosProperty_Skel.pc.in @@ -265,6 +289,8 @@ EXTRA_DIST += \ ## Makefile.CosProperty_Serv.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosProperty_Serv.la libTAO_CosProperty_Serv_la_CPPFLAGS = \ @@ -280,7 +306,7 @@ libTAO_CosProperty_Serv_la_SOURCES = \ Property/CosPropertyService_i.cpp libTAO_CosProperty_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosProperty_Serv_la_LIBADD = \ libTAO_CosProperty_Skel.la \ @@ -301,7 +327,9 @@ CLEANFILES += \ TAO_CosProperty_Serv.pc TAO_CosProperty_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosProperty_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Serv.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_CosProperty_Serv.pc.in @@ -309,6 +337,7 @@ EXTRA_DIST += \ ## Makefile.AV.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ @@ -336,7 +365,7 @@ AVStreamsC.cpp AVStreamsC.h AVStreamsC.inl AVStreamsS.cpp AVStreamsS.h AVStreams AVStreams-stamp: $(srcdir)/AVStreams.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Null_MediaCtrlC.cpp \ @@ -363,7 +392,7 @@ Null_MediaCtrlC.cpp Null_MediaCtrlC.h Null_MediaCtrlC.inl Null_MediaCtrlS.cpp Nu Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ sfpC.cpp \ @@ -390,7 +419,7 @@ sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl sfpS_T.cpp sfpS_T.inl: sfp-sta sfp-stamp: $(srcdir)/sfp.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_AV.la @@ -433,7 +462,7 @@ libTAO_AV_la_SOURCES = \ sfpS.cpp libTAO_AV_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_AV_la_LIBADD = \ libTAO_CosNaming.la \ @@ -505,6 +534,7 @@ nobase_include_HEADERS += \ sfpS_T.inl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS EXTRA_DIST += \ AV.rc @@ -512,6 +542,8 @@ EXTRA_DIST += \ ## Makefile.CosConcurrency_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ CosConcurrencyControlC.cpp \ CosConcurrencyControlC.h \ @@ -539,14 +571,18 @@ CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl C CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ CosConcurrencyControl.idl +endif BUILD_EXCEPTIONS + ## Makefile.CosConcurrency.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosConcurrency.la libTAO_CosConcurrency_la_CPPFLAGS = \ @@ -562,7 +598,7 @@ libTAO_CosConcurrency_la_SOURCES = \ CosConcurrencyControlC.cpp libTAO_CosConcurrency_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosConcurrency_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -581,7 +617,9 @@ CLEANFILES += \ TAO_CosConcurrency.pc TAO_CosConcurrency.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosConcurrency.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_CosConcurrency.pc.in @@ -589,6 +627,8 @@ EXTRA_DIST += \ ## Makefile.CosConcurrency_Skel.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosConcurrency_Skel.la libTAO_CosConcurrency_Skel_la_CPPFLAGS = \ @@ -604,7 +644,7 @@ libTAO_CosConcurrency_Skel_la_SOURCES = \ CosConcurrencyControlS.cpp libTAO_CosConcurrency_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosConcurrency_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -625,7 +665,9 @@ CLEANFILES += \ TAO_CosConcurrency_Skel.pc TAO_CosConcurrency_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosConcurrency_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Skel.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_CosConcurrency_Skel.pc.in @@ -633,6 +675,8 @@ EXTRA_DIST += \ ## Makefile.CosConcurrency_Serv.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosConcurrency_Serv.la libTAO_CosConcurrency_Serv_la_CPPFLAGS = \ @@ -652,7 +696,7 @@ libTAO_CosConcurrency_Serv_la_SOURCES = \ Concurrency/Concurrency_Utils.cpp libTAO_CosConcurrency_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosConcurrency_Serv_la_LIBADD = \ libTAO_CosConcurrency_Skel.la \ @@ -677,7 +721,9 @@ CLEANFILES += \ TAO_CosConcurrency_Serv.pc TAO_CosConcurrency_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosConcurrency_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Serv.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_CosConcurrency_Serv.pc.in @@ -685,7 +731,7 @@ EXTRA_DIST += \ ## Makefile.CosEvent_IDL.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ CosTypedEventCommC.cpp \ @@ -714,7 +760,7 @@ CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommC.inl CosTypedEvent CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosTypedEventChannelAdminC.cpp \ @@ -743,7 +789,7 @@ CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannel CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosEventCommC.cpp \ @@ -772,7 +818,7 @@ CosEventCommC.cpp CosEventCommC.h CosEventCommC.inl CosEventCommS.cpp CosEventCo CosEventComm-stamp: $(srcdir)/CosEventComm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosEventChannelAdminC.cpp \ @@ -801,7 +847,7 @@ CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosE CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ @@ -810,11 +856,11 @@ nobase_include_HEADERS += \ CosTypedEventChannelAdmin.idl \ CosTypedEventComm.idl -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.CosEvent.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosEvent.la @@ -835,7 +881,7 @@ libTAO_CosEvent_la_SOURCES = \ CosTypedEventCommC.cpp libTAO_CosEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -860,9 +906,9 @@ CLEANFILES += \ TAO_CosEvent.pc TAO_CosEvent.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosEvent.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosEvent.rc \ @@ -871,6 +917,8 @@ EXTRA_DIST += \ ## Makefile.Svc_Utils.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ TimeBaseC.cpp \ TimeBaseC.h \ @@ -896,7 +944,7 @@ TimeBaseC.cpp TimeBaseC.h TimeBaseC.inl TimeBaseS.cpp TimeBaseS.h TimeBaseS.inl TimeBase-stamp: $(srcdir)/TimeBase.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecBaseC.cpp \ @@ -923,7 +971,7 @@ RtecBaseC.cpp RtecBaseC.h RtecBaseC.inl RtecBaseS.cpp RtecBaseS.h RtecBaseS.inl RtecBase-stamp: $(srcdir)/RtecBase.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Svc_Utils.la @@ -946,7 +994,7 @@ libTAO_Svc_Utils_la_SOURCES = \ Time_Utilities.cpp libTAO_Svc_Utils_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Svc_Utils_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -982,7 +1030,9 @@ CLEANFILES += \ TAO_Svc_Utils.pc TAO_Svc_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_Svc_Utils.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_Svc_Utils.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_Svc_Utils.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ Svc_Utils.rc \ @@ -991,7 +1041,7 @@ EXTRA_DIST += \ ## Makefile.CosEvent_Skel.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosEvent_Skel.la @@ -1012,7 +1062,7 @@ libTAO_CosEvent_Skel_la_SOURCES = \ CosTypedEventCommS.cpp libTAO_CosEvent_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosEvent_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -1051,9 +1101,9 @@ CLEANFILES += \ TAO_CosEvent_Skel.pc TAO_CosEvent_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosEvent_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent_Skel.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosEvent_Skel.rc \ @@ -1063,7 +1113,7 @@ EXTRA_DIST += \ ## Makefile.CosEvent_Serv.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosEvent_Serv.la @@ -1105,7 +1155,7 @@ libTAO_CosEvent_Serv_la_SOURCES = \ CosEvent/CEC_TypedSupplierAdmin.cpp libTAO_CosEvent_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosEvent_Serv_la_LIBADD = \ libTAO_Svc_Utils.la \ @@ -1177,9 +1227,9 @@ CLEANFILES += \ TAO_CosEvent_Serv.pc TAO_CosEvent_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosEvent_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent_Serv.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -1189,6 +1239,8 @@ EXTRA_DIST += \ ## Makefile.CosLifeCycle.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ CosLifeCycleC.cpp \ CosLifeCycleC.h \ @@ -1216,7 +1268,7 @@ CosLifeCycleC.cpp CosLifeCycleC.h CosLifeCycleC.inl CosLifeCycleS.cpp CosLifeCyc CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ LifeCycleServiceC.cpp \ @@ -1245,7 +1297,7 @@ LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleService LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosLifeCycle.la @@ -1265,7 +1317,7 @@ libTAO_CosLifeCycle_la_SOURCES = \ LifeCycleServiceS.cpp libTAO_CosLifeCycle_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosLifeCycle_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -1299,7 +1351,9 @@ CLEANFILES += \ TAO_CosLifeCycle.pc TAO_CosLifeCycle.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosLifeCycle.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosLifeCycle.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosLifeCycle.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosLifeCycle.rc \ @@ -1309,7 +1363,7 @@ EXTRA_DIST += \ ## Makefile.PortableGroup.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ miopC.cpp \ @@ -1336,7 +1390,7 @@ miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl miopS_T.cpp miopS_T.inl: miop-stamp: $(srcdir)/miop.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableGroup_Simple_DSC.cpp \ @@ -1357,7 +1411,7 @@ PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSC PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableGroupC.cpp \ @@ -1384,7 +1438,7 @@ PortableGroupC.cpp PortableGroupC.h PortableGroupC.inl PortableGroupS.cpp Portab PortableGroup-stamp: $(srcdir)/PortableGroup.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_PortableGroup.la @@ -1442,7 +1496,7 @@ libTAO_PortableGroup_la_SOURCES = \ miopS.cpp libTAO_PortableGroup_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_PortableGroup_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -1527,9 +1581,9 @@ CLEANFILES += \ TAO_PortableGroup.pc TAO_PortableGroup.pc: ${top_builddir}/config.status ${srcdir}/TAO_PortableGroup.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_PortableGroup.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_PortableGroup.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -1541,7 +1595,7 @@ EXTRA_DIST += \ if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ CosLoadBalancingC.cpp \ @@ -1570,7 +1624,7 @@ CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancing CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ LB_ORTC.cpp \ @@ -1595,7 +1649,7 @@ LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl LB_ORTS_T.h LB_ORTS_T.in LB_ORT-stamp: $(srcdir)/LB_ORT.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosLoadBalancing.la @@ -1635,7 +1689,7 @@ libTAO_CosLoadBalancing_la_SOURCES = \ LoadBalancing/LB_ServerRequestInterceptor.cpp libTAO_CosLoadBalancing_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosLoadBalancing_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ @@ -1702,9 +1756,9 @@ CLEANFILES += \ TAO_CosLoadBalancing.pc TAO_CosLoadBalancing.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosLoadBalancing.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosLoadBalancing.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosLoadBalancing.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -1715,6 +1769,8 @@ EXTRA_DIST += \ ## Makefile.CosNaming_Skel.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosNaming_Skel.la libTAO_CosNaming_Skel_la_CPPFLAGS = \ @@ -1730,7 +1786,7 @@ libTAO_CosNaming_Skel_la_SOURCES = \ CosNamingS.cpp libTAO_CosNaming_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNaming_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -1754,7 +1810,9 @@ CLEANFILES += \ TAO_CosNaming_Skel.pc TAO_CosNaming_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNaming_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Skel.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosNaming_Skel.rc \ @@ -1763,6 +1821,7 @@ EXTRA_DIST += \ ## Makefile.CosNaming_Serv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_CosNaming_Serv.la @@ -1792,7 +1851,7 @@ libTAO_CosNaming_Serv_la_SOURCES = \ Naming/Transient_Naming_Context.cpp libTAO_CosNaming_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNaming_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -1833,9 +1892,10 @@ CLEANFILES += \ TAO_CosNaming_Serv.pc TAO_CosNaming_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNaming_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Serv.pc.in endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosNaming_Serv.rc \ @@ -1844,7 +1904,7 @@ EXTRA_DIST += \ ## Makefile.CosNotification_IDL.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ CosNotificationC.cpp \ @@ -1873,7 +1933,7 @@ CosNotificationC.cpp CosNotificationC.h CosNotificationC.inl CosNotificationS.cp CosNotification-stamp: $(srcdir)/CosNotification.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosNotifyCommC.cpp \ @@ -1902,7 +1962,7 @@ CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommC.inl CosNotifyCommS.cpp CosNot CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosNotifyFilterC.cpp \ @@ -1931,7 +1991,7 @@ CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterC.inl CosNotifyFilterS.cp CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosNotifyChannelAdminC.cpp \ @@ -1960,7 +2020,7 @@ CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl C CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ NotifyExtC.cpp \ @@ -1989,7 +2049,7 @@ NotifyExtC.cpp NotifyExtC.h NotifyExtC.inl NotifyExtS.cpp NotifyExtS.h NotifyExt NotifyExt-stamp: $(srcdir)/NotifyExt.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Event_ForwarderC.cpp \ @@ -2018,7 +2078,7 @@ Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderC.inl Event_ForwarderS.cp Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ @@ -2029,11 +2089,11 @@ nobase_include_HEADERS += \ Event_Forwarder.idl \ NotifyExt.idl -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.CosNotification.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosNotification.la @@ -2057,7 +2117,7 @@ libTAO_CosNotification_la_SOURCES = \ NotifyExtC.cpp libTAO_CosNotification_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNotification_la_LIBADD = \ libTAO_CosEvent.la \ @@ -2088,9 +2148,9 @@ CLEANFILES += \ TAO_CosNotification.pc TAO_CosNotification.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNotification.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosNotification.rc \ @@ -2099,6 +2159,8 @@ EXTRA_DIST += \ ## Makefile.ETCL.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_ETCL.la libTAO_ETCL_la_CPPFLAGS = \ @@ -2117,7 +2179,7 @@ libTAO_ETCL_la_SOURCES = \ ETCL/ETCL_y.cpp libTAO_ETCL_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_ETCL_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -2139,7 +2201,9 @@ CLEANFILES += \ TAO_ETCL.pc TAO_ETCL.pc: ${top_builddir}/config.status ${srcdir}/TAO_ETCL.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_ETCL.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_ETCL.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ ETCL.rc \ @@ -2148,7 +2212,7 @@ EXTRA_DIST += \ ## Makefile.CosNotification_Skel.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosNotification_Skel.la @@ -2171,7 +2235,7 @@ libTAO_CosNotification_Skel_la_SOURCES = \ NotifyExtS.cpp libTAO_CosNotification_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNotification_Skel_la_LIBADD = \ libTAO_CosEvent_Skel.la \ @@ -2222,9 +2286,9 @@ CLEANFILES += \ TAO_CosNotification_Skel.pc TAO_CosNotification_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNotification_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification_Skel.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosNotification_Skel.rc \ @@ -2233,7 +2297,7 @@ EXTRA_DIST += \ ## Makefile.CosNotification_Serv.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosNotification_Serv.la @@ -2332,11 +2396,12 @@ libTAO_CosNotification_Serv_la_SOURCES = \ Notify/Worker_Task.cpp libTAO_CosNotification_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNotification_Serv_la_LIBADD = \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_CosNotification_Skel.la \ libTAO_CosEvent_Skel.la \ libTAO_CosNotification.la \ @@ -2463,9 +2528,9 @@ CLEANFILES += \ TAO_CosNotification_Serv.pc TAO_CosNotification_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNotification_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification_Serv.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosNotification_Serv.rc \ @@ -2475,8 +2540,8 @@ EXTRA_DIST += \ ## Makefile.CosNotification_Persist.am if BUILD_ACEXML +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_CosNotification_Persist.la @@ -2497,13 +2562,14 @@ libTAO_CosNotification_Persist_la_SOURCES = \ Notify/XML_Topology_Factory.cpp libTAO_CosNotification_Persist_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNotification_Persist_la_LIBADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_ETCL.la \ libTAO_CosNotification_Skel.la \ libTAO_CosEvent_Skel.la \ @@ -2521,12 +2587,14 @@ nobase_include_HEADERS += \ Notify/XML_Topology_Factory.h \ Notify/notify_persist_export.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_ACEXML ## Makefile.CosTime.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ TimeServiceC.cpp \ TimeServiceC.h \ @@ -2550,7 +2618,7 @@ TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeService-stamp: $(srcdir)/TimeService.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosTime.la @@ -2573,7 +2641,7 @@ libTAO_CosTime_la_SOURCES = \ TimeServiceS.cpp libTAO_CosTime_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTime_la_LIBADD = \ libTAO_Svc_Utils.la \ @@ -2603,7 +2671,9 @@ CLEANFILES += \ TAO_CosTime.pc TAO_CosTime.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTime.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTime.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTime.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosTime.rc \ @@ -2612,6 +2682,8 @@ EXTRA_DIST += \ ## Makefile.CosTrading_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ CosTradingC.cpp \ CosTradingC.h \ @@ -2639,7 +2711,7 @@ CosTradingC.cpp CosTradingC.h CosTradingC.inl CosTradingS.cpp CosTradingS.h CosT CosTrading-stamp: $(srcdir)/CosTrading.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosTradingReposC.cpp \ @@ -2668,7 +2740,7 @@ CosTradingReposC.cpp CosTradingReposC.h CosTradingReposC.inl CosTradingReposS.cp CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosTradingDynamicC.cpp \ @@ -2697,7 +2769,7 @@ CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDyn CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ @@ -2705,8 +2777,12 @@ nobase_include_HEADERS += \ CosTradingDynamic.idl \ CosTradingRepos.idl +endif BUILD_EXCEPTIONS + ## Makefile.CosTrading.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosTrading.la libTAO_CosTrading_la_CPPFLAGS = \ @@ -2724,7 +2800,7 @@ libTAO_CosTrading_la_SOURCES = \ CosTradingReposC.cpp libTAO_CosTrading_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTrading_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -2747,7 +2823,9 @@ CLEANFILES += \ TAO_CosTrading.pc TAO_CosTrading.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTrading.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosTrading.rc \ @@ -2756,6 +2834,8 @@ EXTRA_DIST += \ ## Makefile.CosTrading_Skel.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosTrading_Skel.la libTAO_CosTrading_Skel_la_CPPFLAGS = \ @@ -2773,7 +2853,7 @@ libTAO_CosTrading_Skel_la_SOURCES = \ CosTradingS.cpp libTAO_CosTrading_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTrading_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -2807,7 +2887,9 @@ CLEANFILES += \ TAO_CosTrading_Skel.pc TAO_CosTrading_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTrading_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading_Skel.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosTrading_Skel.rc \ @@ -2816,6 +2898,8 @@ EXTRA_DIST += \ ## Makefile.CosTrading_Serv.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosTrading_Serv.la libTAO_CosTrading_Serv_la_CPPFLAGS = \ @@ -2845,7 +2929,7 @@ libTAO_CosTrading_Serv_la_SOURCES = \ Trader/Trading_Loader.cpp libTAO_CosTrading_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTrading_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -2854,6 +2938,7 @@ libTAO_CosTrading_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ libTAO_CosTrading.la \ @@ -2887,7 +2972,9 @@ CLEANFILES += \ TAO_CosTrading_Serv.pc TAO_CosTrading_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTrading_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading_Serv.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosTrading_Serv.rc \ @@ -2896,6 +2983,8 @@ EXTRA_DIST += \ ## Makefile.DsLogAdmin_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ DsLogAdminC.cpp \ DsLogAdminC.h \ @@ -2923,7 +3012,7 @@ DsLogAdminC.cpp DsLogAdminC.h DsLogAdminC.inl DsLogAdminS.cpp DsLogAdminS.h DsLo DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ DsLogNotificationC.cpp \ @@ -2952,15 +3041,19 @@ DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotifica DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ DsLogAdmin.idl \ DsLogNotification.idl +endif BUILD_EXCEPTIONS + ## Makefile.DsLogAdmin.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_DsLogAdmin.la libTAO_DsLogAdmin_la_CPPFLAGS = \ @@ -2977,7 +3070,7 @@ libTAO_DsLogAdmin_la_SOURCES = \ DsLogNotificationC.cpp libTAO_DsLogAdmin_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsLogAdmin_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -2998,7 +3091,9 @@ CLEANFILES += \ TAO_DsLogAdmin.pc TAO_DsLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsLogAdmin.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ DsLogAdmin.rc \ @@ -3007,7 +3102,7 @@ EXTRA_DIST += \ ## Makefile.DsEventLogAdmin_IDL.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ DsEventLogAdminC.cpp \ @@ -3036,17 +3131,17 @@ DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cp DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ DsEventLogAdmin.idl -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.DsEventLogAdmin.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsEventLogAdmin.la @@ -3064,7 +3159,7 @@ libTAO_DsEventLogAdmin_la_SOURCES = \ DsEventLogAdminC.cpp libTAO_DsEventLogAdmin_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsEventLogAdmin_la_LIBADD = \ libTAO_CosEvent.la \ @@ -3085,9 +3180,9 @@ CLEANFILES += \ TAO_DsEventLogAdmin.pc TAO_DsEventLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsEventLogAdmin.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ DsEventLogAdmin.rc \ @@ -3096,6 +3191,8 @@ EXTRA_DIST += \ ## Makefile.DsLogAdmin_Skel.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_DsLogAdmin_Skel.la libTAO_DsLogAdmin_Skel_la_CPPFLAGS = \ @@ -3112,7 +3209,7 @@ libTAO_DsLogAdmin_Skel_la_SOURCES = \ DsLogNotificationS.cpp libTAO_DsLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsLogAdmin_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -3141,7 +3238,9 @@ CLEANFILES += \ TAO_DsLogAdmin_Skel.pc TAO_DsLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsLogAdmin_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin_Skel.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_DsLogAdmin_Skel.pc.in @@ -3149,6 +3248,8 @@ EXTRA_DIST += \ ## Makefile.DsLogAdmin_Serv.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_DsLogAdmin_Serv.la libTAO_DsLogAdmin_Serv_la_CPPFLAGS = \ @@ -3179,7 +3280,7 @@ libTAO_DsLogAdmin_Serv_la_SOURCES = \ Log/Log_i.cpp libTAO_DsLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsLogAdmin_Serv_la_LIBADD = \ libTAO_Svc_Utils.la \ @@ -3188,6 +3289,7 @@ libTAO_DsLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsLogAdmin_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ libTAO_DsLogAdmin.la \ @@ -3223,7 +3325,9 @@ CLEANFILES += \ TAO_DsLogAdmin_Serv.pc TAO_DsLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsLogAdmin_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin_Serv.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_DsLogAdmin_Serv.pc.in @@ -3231,7 +3335,7 @@ EXTRA_DIST += \ ## Makefile.DsEventLogAdmin_Skel.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Skel.la @@ -3249,7 +3353,7 @@ libTAO_DsEventLogAdmin_Skel_la_SOURCES = \ DsEventLogAdminS.cpp libTAO_DsEventLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsEventLogAdmin_Skel_la_LIBADD = \ libTAO_CosEvent_Skel.la \ @@ -3277,9 +3381,9 @@ CLEANFILES += \ TAO_DsEventLogAdmin_Skel.pc TAO_DsEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_DsEventLogAdmin_Skel.pc.in @@ -3288,7 +3392,7 @@ EXTRA_DIST += \ ## Makefile.DsEventLogAdmin_Serv.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Serv.la @@ -3309,7 +3413,7 @@ libTAO_DsEventLogAdmin_Serv_la_SOURCES = \ Log/EventLog_i.cpp libTAO_DsEventLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ libTAO_CosEvent_Serv.la \ @@ -3317,7 +3421,6 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ $(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 \ libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -3325,6 +3428,7 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ libTAO_Svc_Utils.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsEventLogAdmin_Skel.la \ libTAO_CosEvent_Skel.la \ libTAO_DsLogAdmin_Skel.la \ @@ -3350,9 +3454,9 @@ CLEANFILES += \ TAO_DsEventLogAdmin_Serv.pc TAO_DsEventLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -3361,7 +3465,7 @@ EXTRA_DIST += \ ## Makefile.DsNotifyLogAdmin_IDL.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ DsNotifyLogAdminC.cpp \ @@ -3390,17 +3494,17 @@ DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdmin DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ DsNotifyLogAdmin.idl -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.DsNotifyLogAdmin.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin.la @@ -3418,7 +3522,7 @@ libTAO_DsNotifyLogAdmin_la_SOURCES = \ DsNotifyLogAdminC.cpp libTAO_DsNotifyLogAdmin_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsNotifyLogAdmin_la_LIBADD = \ libTAO_CosNotification.la \ @@ -3441,9 +3545,9 @@ CLEANFILES += \ TAO_DsNotifyLogAdmin.pc TAO_DsNotifyLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsNotifyLogAdmin.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ DsNotifyLogAdmin.rc \ @@ -3452,7 +3556,7 @@ EXTRA_DIST += \ ## Makefile.DsNotifyLogAdmin_Skel.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Skel.la @@ -3470,7 +3574,7 @@ libTAO_DsNotifyLogAdmin_Skel_la_SOURCES = \ DsNotifyLogAdminS.cpp libTAO_DsNotifyLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsNotifyLogAdmin_Skel_la_LIBADD = \ libTAO_CosNotification_Skel.la \ @@ -3502,9 +3606,9 @@ CLEANFILES += \ TAO_DsNotifyLogAdmin_Skel.pc TAO_DsNotifyLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_DsNotifyLogAdmin_Skel.pc.in @@ -3512,7 +3616,7 @@ EXTRA_DIST += \ ## Makefile.DsNotifyLogAdmin_Serv.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Serv.la @@ -3533,7 +3637,7 @@ libTAO_DsNotifyLogAdmin_Serv_la_SOURCES = \ Log/NotifyLog_i.cpp libTAO_DsNotifyLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \ libTAO_DsLogAdmin_Serv.la \ @@ -3543,6 +3647,7 @@ libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \ libTAO_Svc_Utils.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsNotifyLogAdmin_Skel.la \ libTAO_CosNotification_Skel.la \ libTAO_DsEventLogAdmin_Skel.la \ @@ -3572,69 +3677,18 @@ CLEANFILES += \ TAO_DsNotifyLogAdmin_Serv.pc TAO_DsNotifyLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_DsNotifyLogAdmin_Serv.pc.in -## Makefile.ESF.am - - -nobase_include_HEADERS += \ - ESF/ESF_Busy_Lock.cpp \ - ESF/ESF_Busy_Lock.h \ - ESF/ESF_Busy_Lock.inl\ - ESF/ESF_Copy_On_Read.cpp \ - ESF/ESF_Copy_On_Read.h \ - ESF/ESF_Copy_On_Write.cpp \ - ESF/ESF_Copy_On_Write.h \ - ESF/ESF_Copy_On_Write.inl\ - ESF/ESF_Defaults.h \ - ESF/ESF_Delayed_Changes.cpp \ - ESF/ESF_Delayed_Changes.h \ - ESF/ESF_Delayed_Changes.inl\ - ESF/ESF_Delayed_Command.cpp \ - ESF/ESF_Delayed_Command.h \ - ESF/ESF_Delayed_Command.inl\ - ESF/ESF_Immediate_Changes.cpp \ - ESF/ESF_Immediate_Changes.h \ - ESF/ESF_Immediate_Changes.inl\ - ESF/ESF_Peer_Admin.cpp \ - ESF/ESF_Peer_Admin.h \ - ESF/ESF_Peer_Workers.cpp \ - ESF/ESF_Peer_Workers.h \ - ESF/ESF_Peer_Workers.inl\ - ESF/ESF_Proxy_Admin.cpp \ - ESF/ESF_Proxy_Admin.h \ - ESF/ESF_Proxy_Admin.inl\ - ESF/ESF_Proxy_Collection.cpp \ - ESF/ESF_Proxy_Collection.h \ - ESF/ESF_Proxy_List.cpp \ - ESF/ESF_Proxy_List.h \ - ESF/ESF_Proxy_List.inl\ - ESF/ESF_Proxy_RB_Tree.cpp \ - ESF/ESF_Proxy_RB_Tree.h \ - ESF/ESF_Proxy_RB_Tree.inl\ - ESF/ESF_Proxy_RefCount_Guard.cpp \ - ESF/ESF_Proxy_RefCount_Guard.h \ - ESF/ESF_Proxy_RefCount_Guard.inl\ - ESF/ESF_RefCount_Guard.cpp \ - ESF/ESF_RefCount_Guard.h \ - ESF/ESF_RefCount_Guard.inl\ - ESF/ESF_Shutdown_Proxy.cpp \ - ESF/ESF_Shutdown_Proxy.h \ - ESF/ESF_Shutdown_Proxy.inl\ - ESF/ESF_Worker.cpp \ - ESF/ESF_Worker.h \ - ESF/esf_export.h - ## Makefile.FTORB_Utils.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ FT_CORBA_ORBC.cpp \ @@ -3663,7 +3717,7 @@ FT_CORBA_ORBC.cpp FT_CORBA_ORBC.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.cpp FT_CORBA_O FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_FTORB_Utils.la @@ -3682,7 +3736,7 @@ libTAO_FTORB_Utils_la_SOURCES = \ FaultTolerance/FT_IOGR_Property.cpp libTAO_FTORB_Utils_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FTORB_Utils_la_LIBADD = \ libTAO_PortableGroup.la \ @@ -3717,9 +3771,9 @@ CLEANFILES += \ TAO_FTORB_Utils.pc TAO_FTORB_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_FTORB_Utils.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_FTORB_Utils.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_FTORB_Utils.pc.in -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -3729,6 +3783,7 @@ EXTRA_DIST += \ ## Makefile.FTRT_ClientORB.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_FTRT_ClientORB.la @@ -3747,7 +3802,7 @@ libTAO_FTRT_ClientORB_la_SOURCES = \ FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp libTAO_FTRT_ClientORB_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FTRT_ClientORB_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -3764,10 +3819,13 @@ nobase_include_HEADERS += \ FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h \ FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTEvent.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ RtecDefaultEventDataC.cpp \ RtecDefaultEventDataC.h \ @@ -3785,7 +3843,7 @@ RtecDefaultEventDataC.cpp RtecDefaultEventDataC.h RtecDefaultEventDataC.inl Rtec RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecEventCommC.cpp \ @@ -3804,7 +3862,7 @@ RtecEventCommC.cpp RtecEventCommC.h RtecEventCommC.inl RtecEventCommS_T.cpp: Rte RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecEventChannelAdminC.cpp \ @@ -3823,7 +3881,7 @@ RtecEventChannelAdminC.cpp RtecEventChannelAdminC.h RtecEventChannelAdminC.inl R RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecUDPAdminC.cpp \ @@ -3842,7 +3900,7 @@ RtecUDPAdminC.cpp RtecUDPAdminC.h RtecUDPAdminC.inl RtecUDPAdminS_T.cpp: RtecUDP RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTEvent.la @@ -3863,7 +3921,7 @@ libTAO_RTEvent_la_SOURCES = \ RtecUDPAdminC.cpp libTAO_RTEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEvent_la_LIBADD = \ libTAO_Svc_Utils.la \ @@ -3897,7 +3955,9 @@ CLEANFILES += \ TAO_RTEvent.pc TAO_RTEvent.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEvent.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ RTEvent.rc \ @@ -3907,6 +3967,7 @@ EXTRA_DIST += \ ## Makefile.RTEvent_Skel.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_RTEvent_Skel.la @@ -3926,7 +3987,7 @@ libTAO_RTEvent_Skel_la_SOURCES = \ RtecUDPAdminS.cpp libTAO_RTEvent_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEvent_Skel_la_LIBADD = \ libTAO_RTEvent.la \ @@ -3958,8 +4019,9 @@ CLEANFILES += \ TAO_RTEvent_Skel.pc TAO_RTEvent_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEvent_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Skel.pc.in +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -3970,6 +4032,7 @@ EXTRA_DIST += \ ## Makefile.RTEvent_Serv.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTEvent_Serv.la @@ -4056,7 +4119,7 @@ libTAO_RTEvent_Serv_la_SOURCES = \ Event/EC_UDP_Admin.cpp libTAO_RTEvent_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEvent_Serv_la_LIBADD = \ libTAO_RTEvent_Skel.la \ @@ -4191,9 +4254,10 @@ CLEANFILES += \ TAO_RTEvent_Serv.pc TAO_RTEvent_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEvent_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Serv.pc.in endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -4204,8 +4268,8 @@ EXTRA_DIST += \ ## Makefile.FtRtEvent.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES += \ FTRTC.cpp \ @@ -4234,7 +4298,7 @@ FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl FTRTS_T.cpp FTRTS_T.h FT FTRT-stamp: $(srcdir)/FTRT.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FtRtecEventCommC.cpp \ @@ -4263,7 +4327,7 @@ FtRtecEventCommC.cpp FtRtecEventCommC.h FtRtecEventCommC.inl FtRtecEventCommS.cp FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FTRT_GroupManagerC.cpp \ @@ -4292,7 +4356,7 @@ FTRT_GroupManagerC.cpp FTRT_GroupManagerC.h FTRT_GroupManagerC.inl FTRT_GroupMan FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FtRtecEventChannelAdminC.cpp \ @@ -4321,7 +4385,7 @@ FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_FtRtEvent.la @@ -4349,7 +4413,7 @@ libTAO_FtRtEvent_la_SOURCES = \ FtRtecEventCommS.cpp libTAO_FtRtEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FtRtEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ @@ -4412,15 +4476,15 @@ nobase_include_HEADERS += \ FtRtecEventCommS_T.h \ FtRtecEventCommS_T.inl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.FTRT_EventChannel.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la @@ -4470,7 +4534,7 @@ libTAO_FTRT_EventChannel_la_SOURCES = \ FtRtEvent/EventChannel/replace_key.cpp libTAO_FTRT_EventChannel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FTRT_EventChannel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ @@ -4536,17 +4600,17 @@ nobase_include_HEADERS += \ FtRtEvent/EventChannel/create_persistent_poa.h \ FtRtEvent/EventChannel/ftrtec_export.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.FT_ClientORB.am if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FT_ClientORB.la @@ -4570,7 +4634,7 @@ libTAO_FT_ClientORB_la_SOURCES = \ FaultTolerance/FT_Service_Callbacks.cpp libTAO_FT_ClientORB_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FT_ClientORB_la_LIBADD = \ libTAO_FTORB_Utils.la \ @@ -4604,11 +4668,11 @@ CLEANFILES += \ TAO_FT_ClientORB.pc TAO_FT_ClientORB.pc: ${top_builddir}/config.status ${srcdir}/TAO_FT_ClientORB.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_FT_ClientORB.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_FT_ClientORB.pc.in -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -4619,8 +4683,8 @@ EXTRA_DIST += \ ## Makefile.FT_ServerORB.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FT_ServerORB.la @@ -4641,7 +4705,7 @@ libTAO_FT_ServerORB_la_SOURCES = \ FaultTolerance/FT_ServerService_Activate.cpp libTAO_FT_ServerORB_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FT_ServerORB_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ @@ -4673,10 +4737,10 @@ CLEANFILES += \ TAO_FT_ServerORB.pc TAO_FT_ServerORB.pc: ${top_builddir}/config.status ${srcdir}/TAO_FT_ServerORB.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_FT_ServerORB.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_FT_ServerORB.pc.in -endif !BUILD_MINIMUM_CORBA endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -4687,9 +4751,9 @@ EXTRA_DIST += \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES += \ FT_CORBAC.cpp \ @@ -4716,7 +4780,7 @@ FT_CORBAC.cpp FT_CORBAC.h FT_CORBAC.inl FT_CORBAS.cpp FT_CORBAS.h FT_CORBAS.inl FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_ReplicaC.cpp \ @@ -4743,7 +4807,7 @@ FT_ReplicaC.cpp FT_ReplicaC.h FT_ReplicaC.inl FT_ReplicaS.cpp FT_ReplicaS.h FT_R FT_Replica-stamp: $(srcdir)/FT_Replica.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_NotifierC.cpp \ @@ -4770,7 +4834,7 @@ FT_NotifierC.cpp FT_NotifierC.h FT_NotifierC.inl FT_NotifierS.cpp FT_NotifierS.h FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_FaultDetectorFactoryC.cpp \ @@ -4797,7 +4861,7 @@ FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryC FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_ReplicationManagerC.cpp \ @@ -4824,7 +4888,7 @@ FT_ReplicationManagerC.cpp FT_ReplicationManagerC.h FT_ReplicationManagerC.inl F FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_FaultTolerance.la @@ -4851,7 +4915,7 @@ libTAO_FaultTolerance_la_SOURCES = \ FT_ReplicationManagerS.cpp libTAO_FaultTolerance_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FaultTolerance_la_LIBADD = \ libTAO_FT_ServerORB.la \ @@ -4917,11 +4981,11 @@ CLEANFILES += \ TAO_FaultTolerance.pc TAO_FaultTolerance.pc: ${top_builddir}/config.status ${srcdir}/TAO_FaultTolerance.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_FaultTolerance.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_FaultTolerance.pc.in -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -4932,6 +4996,7 @@ EXTRA_DIST += \ ## Makefile.HTIOP.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ @@ -4951,7 +5016,7 @@ HTIOPC.cpp HTIOPC.h HTIOPC.inl HTIOPS.h: HTIOP-stamp HTIOP-stamp: $(srcdir)/HTIOP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS $(srcdir)/HTIOP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ HTIOP/htiop_endpointsC.cpp \ @@ -4968,7 +5033,7 @@ HTIOP/htiop_endpointsC.cpp HTIOP/htiop_endpointsC.h HTIOP/htiop_endpointsS.h: HT HTIOP/htiop_endpoints-stamp: $(srcdir)/HTIOP/htiop_endpoints.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS -Sci -Gp -Gd -Ge 1 -Sa -Sorb -o HTIOP $(srcdir)/HTIOP/htiop_endpoints.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_HTIOP.la @@ -4997,7 +5062,7 @@ libTAO_HTIOP_la_SOURCES = \ HTIOPC.cpp libTAO_HTIOP_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_HTIOP_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -5006,6 +5071,7 @@ libTAO_HTIOP_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ + Channel_Clients_T.cpp \ HTIOP.idl \ HTIOP/HTIOP_Acceptor.h \ HTIOP/HTIOP_Acceptor.inl \ @@ -5027,11 +5093,12 @@ nobase_include_HEADERS += \ HTIOPS.h endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.IFRService.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_IFRService.la @@ -5103,7 +5170,7 @@ libTAO_IFRService_la_SOURCES = \ IFRService/WstringDef_i.cpp libTAO_IFRService_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IFRService_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -5182,8 +5249,8 @@ nobase_include_HEADERS += \ IFRService/ValueMemberDef_i.h \ IFRService/WstringDef_i.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS EXTRA_DIST += \ IFRService.rc @@ -5192,6 +5259,7 @@ EXTRA_DIST += \ ## Makefile.RTCORBAEvent.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO @@ -5211,7 +5279,7 @@ libTAO_RTCORBAEvent_la_SOURCES = \ Event/EC_RTCORBA_Factory.cpp libTAO_RTCORBAEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTCORBAEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ @@ -5235,11 +5303,13 @@ nobase_include_HEADERS += \ endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTEventLogAdmin_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES += \ RTEventLogAdminC.cpp \ @@ -5268,17 +5338,19 @@ RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cp RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ RTEventLogAdmin.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTEventLogAdmin.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la @@ -5295,7 +5367,7 @@ libTAO_RTEventLogAdmin_la_SOURCES = \ RTEventLogAdminC.cpp libTAO_RTEventLogAdmin_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEventLogAdmin_la_LIBADD = \ libTAO_RTEvent.la \ @@ -5322,8 +5394,9 @@ CLEANFILES += \ TAO_RTEventLogAdmin.pc TAO_RTEventLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEventLogAdmin.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin.pc.in +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -5332,6 +5405,8 @@ EXTRA_DIST += \ ## Makefile.RTSched.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ RtecSchedulerC.cpp \ RtecSchedulerC.h \ @@ -5359,7 +5434,7 @@ RtecSchedulerC.cpp RtecSchedulerC.h RtecSchedulerC.inl RtecSchedulerS.cpp RtecSc RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTSched.la @@ -5387,7 +5462,7 @@ libTAO_RTSched_la_SOURCES = \ Scheduler_Utilities.cpp libTAO_RTSched_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTSched_la_LIBADD = \ libTAO_Svc_Utils.la \ @@ -5422,6 +5497,8 @@ nobase_include_HEADERS += \ Scheduler_Utilities.h \ Scheduler_Utilities.inl +endif BUILD_EXCEPTIONS + EXTRA_DIST += \ RTSched.rc @@ -5429,6 +5506,7 @@ EXTRA_DIST += \ ## Makefile.RTEventLogAdmin_Skel.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Skel.la @@ -5445,7 +5523,7 @@ libTAO_RTEventLogAdmin_Skel_la_SOURCES = \ RTEventLogAdminS.cpp libTAO_RTEventLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEventLogAdmin_Skel_la_LIBADD = \ libTAO_RTEvent_Skel.la \ @@ -5478,8 +5556,9 @@ CLEANFILES += \ TAO_RTEventLogAdmin_Skel.pc TAO_RTEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -5489,6 +5568,7 @@ EXTRA_DIST += \ ## Makefile.RTEventLogAdmin_Serv.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Serv.la @@ -5509,7 +5589,7 @@ libTAO_RTEventLogAdmin_Serv_la_SOURCES = \ Log/RTEventLog_i.cpp libTAO_RTEventLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEventLogAdmin_Serv_la_LIBADD = \ libTAO_RTSched.la \ @@ -5549,9 +5629,10 @@ CLEANFILES += \ TAO_RTEventLogAdmin_Serv.pc TAO_RTEventLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -5561,6 +5642,7 @@ EXTRA_DIST += \ ## Makefile.RTKokyuEvent.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTKokyuEvent.la @@ -5583,7 +5665,7 @@ libTAO_RTKokyuEvent_la_SOURCES = \ Event/EC_Kokyu_Scheduling.cpp libTAO_RTKokyuEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTKokyuEvent_la_LIBADD = \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ @@ -5614,11 +5696,13 @@ nobase_include_HEADERS += \ Event/EC_Kokyu_Scheduling.inl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTSchedEvent.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTSchedEvent.la @@ -5641,7 +5725,7 @@ libTAO_RTSchedEvent_la_SOURCES = \ Event/EC_Sched_Filter_Builder.cpp libTAO_RTSchedEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTSchedEvent_la_LIBADD = \ libTAO_RTSched.la \ @@ -5671,6 +5755,7 @@ nobase_include_HEADERS += \ Event/EC_Sched_Filter_Builder.inl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -5679,8 +5764,8 @@ EXTRA_DIST += \ ## Makefile.RT_Notification.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_RT_Notification.la @@ -5703,11 +5788,12 @@ libTAO_RT_Notification_la_SOURCES = \ Notify/Structured/RT_StructuredProxyPushSupplier.cpp libTAO_RT_Notification_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RT_Notification_la_LIBADD = \ libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_ETCL.la \ libTAO_CosNotification_Skel.la \ libTAO_CosEvent_Skel.la \ @@ -5731,8 +5817,8 @@ nobase_include_HEADERS += \ Notify/RT_Properties.inl \ Notify/Structured/RT_StructuredProxyPushSupplier.h -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ RT_Notification.rc @@ -5741,6 +5827,7 @@ EXTRA_DIST += \ ## Makefile.Security.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS BUILT_SOURCES += \ @@ -5762,7 +5849,7 @@ CSIC.cpp CSIC.h CSIC.inl CSIS.inl CSIS_T.inl: CSI-stamp CSI-stamp: $(srcdir)/CSI.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CSIIOPC.cpp \ @@ -5783,7 +5870,7 @@ CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl: CSIIOP-stamp CSIIOP-stamp: $(srcdir)/CSIIOP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ GSSUPC.cpp \ @@ -5804,7 +5891,7 @@ GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl GSSUPS_T.inl: GSSUP-stamp GSSUP-stamp: $(srcdir)/GSSUP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityC.cpp \ @@ -5831,7 +5918,7 @@ SecurityC.cpp SecurityC.h SecurityC.inl SecurityS.cpp SecurityS.h SecurityS.inl Security-stamp: $(srcdir)/Security.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityLevel1C.cpp \ @@ -5858,7 +5945,7 @@ SecurityLevel1C.cpp SecurityLevel1C.h SecurityLevel1C.inl SecurityLevel1S.cpp Se SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityLevel2C.cpp \ @@ -5885,7 +5972,7 @@ SecurityLevel2C.cpp SecurityLevel2C.h SecurityLevel2C.inl SecurityLevel2S.cpp Se SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityLevel3C.cpp \ @@ -5906,7 +5993,7 @@ SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl Se SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Security.la @@ -5947,7 +6034,7 @@ libTAO_Security_la_SOURCES = \ SecurityS.cpp libTAO_Security_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Security_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ @@ -6020,6 +6107,7 @@ nobase_include_HEADERS += \ SecurityS_T.inl endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -6029,9 +6117,9 @@ EXTRA_DIST += \ ## Makefile.SSLIOP.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ SSLIOPC.cpp \ @@ -6050,7 +6138,7 @@ SSLIOPC.cpp SSLIOPC.h SSLIOPC.inl SSLIOPS.h: SSLIOP-stamp SSLIOP-stamp: $(srcdir)/SSLIOP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS $(srcdir)/SSLIOP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SSLIOP/ssl_endpointsC.cpp \ @@ -6067,7 +6155,7 @@ SSLIOP/ssl_endpointsC.cpp SSLIOP/ssl_endpointsC.h SSLIOP/ssl_endpointsS.h: SSLIO SSLIOP/ssl_endpoints-stamp: $(srcdir)/SSLIOP/ssl_endpoints.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS -Sci -Gp -Gd -Ge 1 -Sa -Sorb -o SSLIOP $(srcdir)/SSLIOP/ssl_endpoints.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_SSLIOP.la @@ -6112,7 +6200,7 @@ libTAO_SSLIOP_la_SOURCES = \ SSLIOPC.cpp libTAO_SSLIOP_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @ACE_TLS_LDFLAGS@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @ACE_TLS_LDFLAGS@ libTAO_SSLIOP_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ @@ -6128,6 +6216,7 @@ libTAO_SSLIOP_la_LIBADD = \ @ACE_TLS_LIBS@ nobase_include_HEADERS += \ + Channel_Clients_T.cpp \ SSLIOP.idl \ SSLIOP/IIOP_SSL_Acceptor.h \ SSLIOP/IIOP_SSL_Connection_Handler.h \ @@ -6168,9 +6257,9 @@ nobase_include_HEADERS += \ SSLIOPC.inl \ SSLIOPS.h -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am index add39941212..185294e39ea 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am @@ -22,8 +22,8 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -58,8 +58,8 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -67,8 +67,8 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -106,8 +106,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -115,8 +115,8 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -159,8 +159,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am index 252262f26b7..2b41c8c2bcc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am @@ -17,9 +17,9 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Colocated_Roundtrip.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = driver @@ -55,9 +55,9 @@ driver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am index 6b11a5b9d3a..efe422db699 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am @@ -18,9 +18,9 @@ noinst_PROGRAMS = ## Makefile.Federated_Roundtrip_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -57,17 +57,17 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Federated_Roundtrip_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -104,9 +104,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am index b536939e7c1..f1dde6bf6fc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am @@ -21,9 +21,9 @@ noinst_PROGRAMS = ## Makefile.RTCORBA_Baseline_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -58,17 +58,17 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTCORBA_Baseline_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -106,17 +106,17 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTCORBA_Baseline_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -156,9 +156,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am index d94aad01491..579cda5cb6a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am @@ -21,9 +21,9 @@ noinst_PROGRAMS = ## Makefile.RTCORBA_Callback_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -58,17 +58,17 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTCORBA_Callback_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -108,17 +108,17 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTCORBA_Callback_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -160,9 +160,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am index 6a138d998ad..029cc300a49 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am @@ -18,9 +18,9 @@ noinst_PROGRAMS = ## Makefile.Roundtrip_RTEvent_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -56,17 +56,17 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Roundtrip_RTEvent_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -102,9 +102,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am index ce147a0d92d..81b4813c4c7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am @@ -18,9 +18,9 @@ noinst_PROGRAMS = ## Makefile.TCP_Baseline_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -56,17 +56,17 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.TCP_Baseline_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -102,9 +102,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am index cc8e9942d43..cb72a401638 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am @@ -20,9 +20,9 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RTEC_Perf.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ Federated_TestC.cpp \ @@ -167,9 +167,9 @@ noinst_HEADERS = \ Task_Activator.inl \ rtec_perf_export.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am index 8a7311e2ae6..0bfe196d9ba 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Asynch_Three_Stage_Dist.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += distributer @@ -47,9 +48,11 @@ distributer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Asynch_Three_Stage_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -80,9 +83,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Asynch_Three_Stage_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -113,6 +118,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am index 7bf11f4dad7..4478a21beba 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Bidirectional_Flows_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -45,9 +46,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Bidirectional_Flows_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -76,6 +79,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am index c003c046e46..4ac390ff726 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Component_Switching_Dist.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += distributer @@ -48,9 +49,11 @@ distributer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Component_Switching_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -82,9 +85,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Component_Switching_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -116,6 +121,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am index 3db5feff051..5f011923973 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Full_Profile_Ftp.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ftp @@ -45,9 +46,11 @@ ftp_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Full_Profile_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -76,6 +79,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am index 20caef1661f..0f844565b6f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Latency_Cntl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += control @@ -47,9 +48,11 @@ control_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Latency_Ping.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ping @@ -79,9 +82,11 @@ ping_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Latency_Pong.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += pong @@ -111,6 +116,7 @@ pong_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am index d4640caa093..99b358a677f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Modify_QoS_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -45,9 +46,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Modify_QoS_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -76,6 +79,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am index 5027e738f6f..7bfeb08e47c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Multicast_Ftp.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ftp @@ -46,9 +47,11 @@ ftp_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Multicast_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -78,6 +81,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am index 96a3601c4ce..27b52a09998 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Multicast_Full_Profile_Ftp.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ftp @@ -45,9 +46,11 @@ ftp_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Multicast_Full_Profile_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -76,6 +79,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am index 5db84134548..606125b7ed3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Multiple_Flows_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -45,9 +46,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Multiple_Flows_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -76,6 +79,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am index 23de00a8320..d6a771ebaaf 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Pluggable_Ftp.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ftp @@ -45,9 +46,11 @@ ftp_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Pluggable_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -76,6 +79,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am index b97da09530e..aded0981dda 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Pluggable_Flow_Protocol_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -45,9 +46,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Pluggable_Flow_Protocol_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -76,9 +79,11 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Pluggable_Flow_Protocol_Ts.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES = libTAO_TS.la @@ -99,6 +104,7 @@ noinst_HEADERS = \ TimeStamp.h endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am index b3e89ef417b..ec0501a9959 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Simple_Three_Stage_Dist.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += distributer @@ -45,9 +46,11 @@ distributer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Simple_Three_Stage_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -76,9 +79,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Simple_Three_Stage_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -107,6 +112,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am index e4180cd8e0b..2df05d9674f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Simple_Two_Stage_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -48,9 +49,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Simple_Two_Stage_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -80,6 +83,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am index 0f573502d0c..8c5fb6f43a2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Simple_Two_Stage_With_QoS_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -45,9 +46,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Simple_Two_Stage_With_QoS_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -76,6 +79,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am index 7ebd7213a8c..2e8d0086aa8 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.BiDirCORBALOC_Server.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ TimeModuleC.cpp \ TimeModuleC.h \ @@ -79,6 +82,8 @@ TimeServer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am index e583ef1d567..f467720c66e 100644 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Bug_1334_client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -34,6 +37,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am index b0af6b32252..4e42c806b57 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Bug_1393_Regression_Client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -32,6 +35,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am index 6057ce638b5..b923447f282 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Bug_1395_Regression_IDL.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Bug_1395_Regression_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -65,8 +69,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Bug_1395_Regression_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -89,6 +97,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am index a896cd99666..cbbfd8ad9c7 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Bug_1630_testclient.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = testclient @@ -35,7 +35,7 @@ testclient_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/tests/Bug_2074_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am index 02fa11fa326..72b36c37461 100644 --- a/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Bug_2074_Regression_Test.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = test @@ -45,7 +45,7 @@ test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am index 2d5d4b4e89f..13c4b1693c1 100644 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = client @@ -50,9 +50,9 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am index c495afa40c1..312dbfd2a77 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am @@ -51,9 +51,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Manager @@ -87,16 +87,16 @@ Manager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID ## Makefile.Bug_2247_Regression_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -124,7 +124,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am index 244772c3c63..9b1397d499b 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am @@ -40,7 +40,7 @@ CLEANFILES = \ testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sc $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ BUILT_SOURCES += \ @@ -63,7 +63,7 @@ CLEANFILES += \ testsC.cpp testsC.h testsC.inl testsS.cpp testsS.h testsS.inl: tests-stamp tests-stamp: $(srcdir)/tests.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sc $(srcdir)/tests.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/tests.idl @touch $@ @@ -75,9 +75,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -111,9 +111,9 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -121,9 +121,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -165,9 +165,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am index 63042936044..2d1ace182fb 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am @@ -51,9 +51,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -87,9 +87,9 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -97,9 +97,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client2 @@ -135,9 +135,9 @@ client2_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -145,9 +145,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -186,9 +186,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -196,9 +196,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server2 @@ -237,9 +237,9 @@ server2_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am index 4e41c8eec08..41a0529b451 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am @@ -51,9 +51,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -87,9 +87,9 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -97,9 +97,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -138,9 +138,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am index a04dad99ade..f8214dd9c07 100644 --- a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Bug_2316_Regression_Client.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -80,13 +80,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Bug_2316_Regression_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -118,7 +118,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am index 0eaedade3c5..cc54d21323c 100644 --- a/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am @@ -20,7 +20,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Bug_2377_Regression_Test.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ HelloC.cpp \ @@ -85,7 +85,7 @@ uipmc_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am index d73d8319cc3..c81514493b2 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile.am +++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.CC_client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = CC_client CC_client_CPPFLAGS = \ @@ -50,6 +53,8 @@ CC_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am index 4677afe69e4..c0268e4afd9 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am @@ -18,7 +18,7 @@ noinst_PROGRAMS = ## Makefile.CosEvent_Basic_Disconnect.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Disconnect @@ -56,13 +56,13 @@ Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEvent_Basic_MT_Disconnect.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += MT_Disconnect @@ -99,13 +99,13 @@ MT_Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEvent_Basic_Pull_Push_Event.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Pull_Push_Event @@ -143,13 +143,13 @@ Pull_Push_Event_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEvent_Basic_Push_Event.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Push_Event @@ -187,13 +187,13 @@ Push_Event_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEvent_Basic_Random.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Random @@ -230,13 +230,13 @@ Random_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEvent_Basic_Shutdown.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Shutdown @@ -274,7 +274,7 @@ Shutdown_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/CosEvent/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Makefile.am index 19f692f256b..611d13b8620 100644 --- a/TAO/orbsvcs/tests/CosEvent/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/Makefile.am @@ -12,3 +12,4 @@ SUBDIRS = \ lib \ Basic +# Timeout diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am index a9b61c7c29f..132f55111fc 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEvent_Test_Lib.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_LTLIBRARIES = libCECTests.la @@ -39,7 +39,7 @@ noinst_HEADERS = \ Counting_Supplier.h \ cectest_export.h -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am index 6dee1408491..614a67934e4 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.EC_Custom_Marshal_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ dataC.cpp \ @@ -55,11 +56,13 @@ data-stamp: $(srcdir)/data.idl $(TAO_IDL_DEP) noinst_HEADERS = \ data.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ECM_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += ECM_Consumer @@ -94,11 +97,13 @@ ECM_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ECM_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ECM_Supplier @@ -136,6 +141,7 @@ ECM_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am index 550d53a525c..2d4e76e9d6c 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.EC_MT_Mcast.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = MCast @@ -54,6 +55,7 @@ MCast_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am index 9c913d77f7a..efc0e0bf21c 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.EC_Mcast.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = EC_Mcast @@ -49,6 +50,7 @@ EC_Mcast_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am index 0f1ad4410cc..ef1eaba0a3f 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.EC_Multiple.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = EC_Multiple @@ -55,6 +56,7 @@ EC_Multiple_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am index 170b9b086cd..4f04ed9e586 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.ECT_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += ECT_Consumer @@ -53,11 +54,13 @@ ECT_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ECT_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ECT_Supplier @@ -95,11 +98,13 @@ ECT_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ECT_Throughput.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ECT_Throughput @@ -140,6 +145,7 @@ ECT_Throughput_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index b68828bdc89..baf705df43c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Event_Basic_Atomic_Reconnect.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Atomic_Reconnect @@ -53,11 +54,13 @@ Atomic_Reconnect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_BCast.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += BCast @@ -93,11 +96,13 @@ BCast_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Bitmask.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Bitmask @@ -141,11 +146,13 @@ Bitmask_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Complex.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Complex @@ -189,11 +196,13 @@ Complex_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Control.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Control @@ -229,11 +238,13 @@ Control_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Disconnect.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Disconnect @@ -277,11 +288,13 @@ Disconnect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Gateway.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Gateway @@ -325,11 +338,13 @@ Gateway_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_MT_Disconnect.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += MT_Disconnect @@ -365,11 +380,13 @@ MT_Disconnect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Negation.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Negation @@ -413,11 +430,13 @@ Negation_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Observer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Observer @@ -453,11 +472,13 @@ Observer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Random.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Random @@ -493,11 +514,13 @@ Random_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Reconnect.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Reconnect @@ -533,11 +556,13 @@ Reconnect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Shutdown.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Shutdown @@ -573,11 +598,13 @@ Shutdown_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Timeout.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Timeout @@ -621,11 +648,13 @@ Timeout_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Wildcard.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Wildcard @@ -669,6 +698,7 @@ Wildcard_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Makefile.am b/TAO/orbsvcs/tests/Event/Makefile.am index ad70d16ed4e..3807903e334 100644 --- a/TAO/orbsvcs/tests/Event/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Makefile.am @@ -14,3 +14,4 @@ SUBDIRS = \ Performance \ Basic +# UDP diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am index 27940a1cb2b..443c61d62a5 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.ECMcastTests_lib.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES = libECMcastTests.la @@ -40,6 +41,7 @@ noinst_HEADERS = \ Gateway_EC.h endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am index 1b52b4fb3bd..5c1c4a2aa28 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Complex_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += consumer @@ -52,11 +53,13 @@ consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Complex_Gateway_Ec.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += gateway-ec @@ -91,11 +94,13 @@ gateway_ec_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Complex_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += supplier @@ -130,6 +135,7 @@ supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am index 8633ab9fcef..7e6f455cf6c 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am @@ -14,3 +14,5 @@ SUBDIRS = \ Simple \ Two_Way +# RTEC_MCast_Federated + diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am index 617b25f0ec2..93b8bf84898 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Simple_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += consumer @@ -52,11 +53,13 @@ consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Simple_Gateway_Ec.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += gateway-ec @@ -91,11 +94,13 @@ gateway_ec_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Simple_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += supplier @@ -130,6 +135,7 @@ supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am index 9ad215d370a..77efa6f4a6f 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Two_Way_Application.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += application @@ -52,11 +53,13 @@ application_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Two_Way_Gateway_Ec.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += gateway-ec @@ -91,6 +94,7 @@ gateway_ec_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am index b37e6f11b58..0da617d516c 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Event_Performance_Connect.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Connect @@ -53,11 +54,13 @@ Connect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Inversion.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Inversion @@ -93,11 +96,13 @@ Inversion_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Latency.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Latency @@ -134,11 +139,13 @@ Latency_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Latency_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Latency_Server @@ -178,11 +185,13 @@ Latency_Server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Throughput.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Throughput @@ -218,6 +227,7 @@ Throughput_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am index 5df44088400..cc6f3bd2da2 100644 --- a/TAO/orbsvcs/tests/Event/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Event_Test_Lib.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES = libECTests.la @@ -42,11 +43,12 @@ noinst_HEADERS = \ Counting_Consumer.h \ Counting_Supplier.h \ Driver.h \ - Driver.inl\ + Driver.inl \ Supplier.h \ ectest_export.h endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am index 1ce5367ba13..75d5da6667d 100644 --- a/TAO/orbsvcs/tests/FT_App/Makefile.am +++ b/TAO/orbsvcs/tests/FT_App/Makefile.am @@ -22,9 +22,9 @@ noinst_PROGRAMS = if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_analyzer @@ -68,14 +68,16 @@ ft_analyzer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID ## Makefile.FT_App_Idl.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ FT_TestReplicaC.cpp \ FT_TestReplicaC.h \ @@ -109,13 +111,15 @@ FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl $(TAO_IDL_DEP) noinst_HEADERS = \ FT_TestReplica.idl +endif BUILD_EXCEPTIONS + ## Makefile.FT_App_Client.am if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_client @@ -161,9 +165,9 @@ ft_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -171,9 +175,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_create @@ -212,9 +216,9 @@ ft_create_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -222,9 +226,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_registry @@ -260,9 +264,9 @@ ft_registry_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -270,9 +274,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_fault_consumer @@ -313,9 +317,9 @@ ft_fault_consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -323,9 +327,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_notifier @@ -363,9 +367,9 @@ ft_notifier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -373,9 +377,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += replmgr_controller @@ -420,9 +424,9 @@ replmgr_controller_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -430,9 +434,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_replica @@ -474,9 +478,9 @@ ft_replica_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am index 7fc6b28e84a..e644ab24f2a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am @@ -51,9 +51,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -89,9 +89,9 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -99,9 +99,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -141,9 +141,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am index 27be663173a..2a965501bb6 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am @@ -51,9 +51,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Manager @@ -87,9 +87,9 @@ Manager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -97,9 +97,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -135,9 +135,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am index ffcaf97f714..f446221ab9c 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = IOGRTest @@ -52,9 +52,9 @@ IOGRTest_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am index 2e3981fe200..895035c4bad 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am +++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am @@ -19,9 +19,9 @@ noinst_PROGRAMS = if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += consumer @@ -61,9 +61,9 @@ consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -71,9 +71,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += supplier @@ -113,9 +113,9 @@ supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am index 8e47b662087..53a0f232d79 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am +++ b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ ami_testC.cpp \ @@ -50,6 +51,7 @@ ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ ami_test.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -57,6 +59,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -84,6 +87,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -91,6 +95,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -119,6 +124,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -126,6 +132,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += simple_client @@ -153,6 +160,7 @@ simple_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am index 39c535a40ff..2cd1cfc482e 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am @@ -49,7 +49,7 @@ noinst_HEADERS = \ ## Makefile.HTIOP_BiDirectional_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -76,10 +76,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.HTIOP_BiDirectional_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -105,6 +107,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am index 18a98bc6fc4..e632faa74d2 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.HTIOP_Hello_Idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.HTIOP_Hello_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -66,8 +70,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.HTIOP_Hello_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -96,6 +104,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am index 2bc7d3d8d76..15b7ad4a4d8 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am +++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.IOR_MCast_Idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.IOR_MCast_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -77,8 +81,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.IOR_MCast_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -107,6 +115,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Makefile.am index 15e3b659ff7..8bc8fd330d4 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile.am @@ -21,6 +21,9 @@ SUBDIRS = \ NameService \ scale +# SUBDIRS += \ +# Bug_2604_Regression + noinst_PROGRAMS = ## Makefile.airplane_idl.am @@ -54,7 +57,7 @@ noinst_HEADERS = \ ## Makefile.airplane_client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += airplane_client @@ -78,11 +81,11 @@ airplane_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.airplane_server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += airplane_server @@ -109,7 +112,7 @@ airplane_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.nestea_idl.am @@ -142,7 +145,7 @@ noinst_HEADERS += \ ## Makefile.nestea_client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += nestea_client @@ -166,12 +169,12 @@ nestea_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.nestea_server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += nestea_server @@ -198,8 +201,8 @@ nestea_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am index 038d3a8f254..8ced4a626dc 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.ImplRepo_NameService.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = test @@ -37,7 +37,7 @@ test_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/tests/ImplRepo/scale/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am index 7b336b7db96..22afdc7c663 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am @@ -49,7 +49,7 @@ noinst_HEADERS = \ ## Makefile.scaletest_client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -72,11 +72,11 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.scaletest_server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -101,7 +101,7 @@ server_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/tests/InterfaceRepo/Application_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am index 7e6f5e5bdcf..f405a951391 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am @@ -21,7 +21,7 @@ noinst_PROGRAMS = ## Makefile.IFR_Application_Test_Client.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -48,12 +48,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.IFR_Application_Test_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ testC.cpp \ @@ -104,7 +104,7 @@ server_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/tests/InterfaceRepo/IDL3_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am index 34c2f1abb7d..471b2f19e9a 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.IFR_IDL3_Test.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = IDL3_Test @@ -37,7 +37,7 @@ IDL3_Test_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/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am index 65568172685..c5f823f364c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.IFR_Inheritance_Test.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = IFR_Inheritance_Test IFR_Inheritance_Test_CPPFLAGS = \ @@ -33,6 +36,8 @@ IFR_Inheritance_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am index 7df8ba75c5c..d97df280f9a 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.IFR_IFR_Test.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = IFR_Test @@ -37,7 +37,7 @@ IFR_Test_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/tests/InterfaceRepo/Latency_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am index 269964f7a1a..5cd0c3a6029 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Latency_Test.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = client @@ -38,6 +39,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am index 9a124a27e7b..434c936a151 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.IFR_Persistence_Test.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = Persistence_Test @@ -37,7 +37,7 @@ Persistence_Test_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/tests/Interoperable_Naming/Makefile.am b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am index bea2ef61ae1..c2157937015 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.Interoperable_Naming.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ Web_ServerC.cpp \ Web_ServerC.h \ @@ -77,6 +80,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am index 17331079c93..4f4d8898147 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am @@ -51,7 +51,7 @@ noinst_HEADERS = \ if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -87,7 +87,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -95,7 +95,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -134,7 +134,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am index c5dee68b8be..6b6248c8d5e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am @@ -51,7 +51,7 @@ noinst_HEADERS = \ if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -89,7 +89,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -97,7 +97,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -141,7 +141,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am index 8f8d87249e8..5a006b464f6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am @@ -21,7 +21,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ TestC.cpp \ @@ -97,7 +97,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am index f9c6fe2837e..1caa1b015f9 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am @@ -18,7 +18,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = client @@ -50,7 +50,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am index b4e0f64554f..6650036eb9e 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Log_Basic_Log_Test.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -34,12 +37,15 @@ client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am index 3db8a30cb7f..77d54729310 100644 --- a/TAO/orbsvcs/tests/Makefile.am +++ b/TAO/orbsvcs/tests/Makefile.am @@ -54,3 +54,4 @@ SUBDIRS = \ ior_corbaname \ tests_svc_loader +# Bug_2615_Regression diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am index a0a511d4393..5d44def86a7 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am +++ b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.McastHello_Client.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -80,13 +80,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.McastHello_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -118,7 +118,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am index 3a4a36013ce..117a6038b80 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am @@ -18,7 +18,7 @@ noinst_PROGRAMS = ## Makefile.Basic_Notify_AdminProperties.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += AdminProperties @@ -44,10 +44,10 @@ AdminProperties_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 \ @@ -59,13 +59,13 @@ AdminProperties_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_ConnectDisconnect.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += ConnectDisconnect @@ -91,10 +91,10 @@ ConnectDisconnect_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 \ @@ -106,13 +106,13 @@ ConnectDisconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Events.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Events @@ -138,10 +138,10 @@ Events_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 \ @@ -153,13 +153,13 @@ Events_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Filter.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Filter @@ -185,10 +185,10 @@ Filter_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 \ @@ -200,13 +200,13 @@ Filter_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_IdAssignment.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += IdAssignment @@ -232,10 +232,10 @@ IdAssignment_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 \ @@ -247,13 +247,13 @@ IdAssignment_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_LifeCycle.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += LifeCycle @@ -279,10 +279,10 @@ LifeCycle_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 \ @@ -294,13 +294,13 @@ LifeCycle_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_MultiTypes.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += MultiTypes @@ -326,10 +326,10 @@ MultiTypes_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 \ @@ -341,13 +341,13 @@ MultiTypes_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Sequence.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence @@ -373,10 +373,10 @@ Sequence_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 \ @@ -388,13 +388,13 @@ Sequence_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Simple.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Simple @@ -420,10 +420,10 @@ Simple_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 \ @@ -435,13 +435,13 @@ Simple_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Updates.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Updates @@ -467,10 +467,10 @@ Updates_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 \ @@ -482,7 +482,7 @@ Updates_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am index c03d37e861b..02e5388c7e6 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Blocking_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -78,10 +78,10 @@ Structured_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 \ @@ -93,13 +93,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Blocking_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -127,10 +127,10 @@ Structured_Supplier_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 \ @@ -142,7 +142,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am index a16dbea16ed..edd5cae2e19 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Test_Destroy.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = Notify_Tests_Destroy @@ -43,10 +43,10 @@ Notify_Tests_Destroy_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 \ @@ -58,7 +58,7 @@ Notify_Tests_Destroy_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am index fe056312136..3a9ebd3243a 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Discarding_Ntf_Seq_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Consumer @@ -78,10 +78,10 @@ Sequence_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 \ @@ -93,13 +93,13 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Seq_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Supplier @@ -128,10 +128,10 @@ Sequence_Supplier_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 \ @@ -143,13 +143,13 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -177,10 +177,10 @@ Structured_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 \ @@ -192,13 +192,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -227,10 +227,10 @@ Structured_Supplier_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 \ @@ -242,7 +242,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am index aa14a71cd4f..d08de6f9acc 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Test_Driver.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = Notify_Tests_Driver @@ -42,10 +42,10 @@ Notify_Tests_Driver_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 \ @@ -57,7 +57,7 @@ Notify_Tests_Driver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am index c78ddc8f1fe..787e88da95a 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am @@ -54,8 +54,8 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.MT_Dispatching_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -83,10 +83,10 @@ Structured_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 \ @@ -98,15 +98,15 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.MT_Dispatching_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -134,10 +134,10 @@ Structured_Supplier_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 \ @@ -149,8 +149,8 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am index dfe5e1ea684..b214bd301e1 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Ordering_Ntf_Seq_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Consumer @@ -78,10 +78,10 @@ Sequence_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 \ @@ -93,13 +93,13 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Seq_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Supplier @@ -128,10 +128,10 @@ Sequence_Supplier_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 \ @@ -143,13 +143,13 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -177,10 +177,10 @@ Structured_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 \ @@ -192,13 +192,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -227,10 +227,10 @@ Structured_Supplier_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 \ @@ -242,7 +242,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am index 40b502a5abf..9c437f749d5 100644 --- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am @@ -18,7 +18,6 @@ TAO_ROOT = $(top_srcdir) if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libNotifyPlugTop.la @@ -40,7 +39,6 @@ noinst_HEADERS = \ Test_Saver.h \ Test_Topology_Factory.h -endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -48,7 +46,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = main @@ -86,7 +83,6 @@ main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am index e665d59cb88..9a308abb944 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RT_Notify_lib.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libTAO_RT_NotifyTests.la @@ -44,8 +44,8 @@ noinst_HEADERS = \ RT_POA_Command.h \ RT_Priority_Mapping.h -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am index 40c52148050..831fc62862f 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am @@ -18,7 +18,7 @@ noinst_PROGRAMS = ## Makefile.Reconnecting_Consumer.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Consumer @@ -44,10 +44,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 \ @@ -59,13 +59,13 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Reconnecting_Supplier.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Supplier @@ -91,10 +91,10 @@ Supplier_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 \ @@ -106,7 +106,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. 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 9cac82d4d1e..d5b591bf1ce 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am @@ -54,8 +54,8 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Cons.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -83,10 +83,10 @@ Sequence_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 \ @@ -98,15 +98,15 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Supp.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -134,10 +134,10 @@ Sequence_Supplier_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 \ @@ -149,8 +149,8 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am index e631380281c..2da2643eee8 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Seq_Multi_Filter_Ntf_Seq_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Consumer @@ -78,10 +78,10 @@ Sequence_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 \ @@ -93,13 +93,13 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Seq_Multi_Filter_Ntf_Seq_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Supplier @@ -127,10 +127,10 @@ Sequence_Supplier_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 \ @@ -142,7 +142,7 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am index 86a4ee0f29e..ae55e238085 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Struct_Filter_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -78,10 +78,10 @@ Structured_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 \ @@ -93,13 +93,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Struct_Filter_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -127,10 +127,10 @@ Structured_Supplier_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 \ @@ -142,7 +142,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am index 34ce6df284b..eaddbf6f444 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Struct_Multi_Filter_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -78,10 +78,10 @@ Structured_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 \ @@ -93,13 +93,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Struct_Multi_Filter_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -128,10 +128,10 @@ Structured_Supplier_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 \ @@ -143,7 +143,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am index 98815fbca6e..a02868bb942 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am @@ -16,8 +16,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.TAO_RT_NotifyTests_Filter.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libTAO_RT_NotifyTests_Filter.la @@ -39,8 +39,8 @@ noinst_HEADERS = \ RT_Test_Filter.h \ RT_Test_FilterFactory.h -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am index 78d0832f1b2..437189cffdf 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.XML_Persistence.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = main @@ -55,7 +55,7 @@ main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am index a209a46382e..9cd8939544f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am @@ -20,7 +20,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.NotifyTests_Lib.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ Activation_ManagerC.cpp \ @@ -171,7 +171,7 @@ noinst_HEADERS = \ common.h \ notify_test_export.h -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am index 4718b9c9c15..6614fc12c56 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am @@ -20,8 +20,6 @@ noinst_PROGRAMS = ## Makefile.Filter_Idl.am -if !BUILD_MINIMUM_CORBA - BUILT_SOURCES = \ goC.cpp \ goC.h \ @@ -49,12 +47,10 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) noinst_HEADERS = \ go.idl -endif !BUILD_MINIMUM_CORBA - ## Makefile.Filter_Notify_Perf_Sequence_Consumer.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Consumer @@ -82,10 +78,10 @@ Sequence_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 \ @@ -97,13 +93,13 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Seq_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Supplier @@ -132,10 +128,10 @@ Sequence_Supplier_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 \ @@ -147,13 +143,13 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -181,10 +177,10 @@ Structured_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 \ @@ -196,13 +192,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -231,10 +227,10 @@ Structured_Supplier_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 \ @@ -246,7 +242,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am index 56b72ea0e04..a41e1be69b1 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RedGreen_Ntf_Perf_RedGreen.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = RedGreen_Test @@ -44,10 +44,10 @@ RedGreen_Test_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 \ @@ -59,7 +59,7 @@ RedGreen_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am index 3b6efe85d86..fcabd44fe32 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Throughput_Ntf_Perf_Throughput.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Throughput @@ -45,10 +45,10 @@ Throughput_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 \ @@ -60,8 +60,8 @@ Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Property/Makefile.am b/TAO/orbsvcs/tests/Property/Makefile.am index 689e58209a1..2c4a37be736 100644 --- a/TAO/orbsvcs/tests/Property/Makefile.am +++ b/TAO/orbsvcs/tests/Property/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Property_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -40,8 +44,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Property_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -69,6 +77,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am index 7ff62dd7eec..332ca6ceeca 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.Redundant_Naming_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ test_objectC.cpp \ test_objectC.h \ @@ -75,6 +78,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Sched/Makefile.am b/TAO/orbsvcs/tests/Sched/Makefile.am index d561f875016..8bc86453037 100644 --- a/TAO/orbsvcs/tests/Sched/Makefile.am +++ b/TAO/orbsvcs/tests/Sched/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Sched.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = Sched Sched_CPPFLAGS = \ @@ -37,6 +40,8 @@ Sched_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile.am b/TAO/orbsvcs/tests/Sched_Conf/Makefile.am index 3ea1fb05ab9..70335c7c397 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Makefile.am +++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Sched_Conf.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = Sched_Conf Sched_Conf_CPPFLAGS = \ @@ -39,6 +42,8 @@ Sched_Conf_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am index 2f02b708355..fdaeae7502b 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am +++ b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am @@ -49,7 +49,7 @@ noinst_HEADERS = \ ## Makefile.Secure_BiDir_SSL_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -76,11 +76,11 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Secure_BiDir_SSL_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -107,7 +107,7 @@ server_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/tests/Security/Big_Request/Makefile.am b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am index 21c8934a1bd..768e3c7d758 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am @@ -49,8 +49,8 @@ noinst_HEADERS = \ ## Makefile.Big_Request_Security_Client.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -77,13 +77,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Makefile.Big_Request_Security_Server.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -113,8 +113,8 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Security/Callback/Makefile.am b/TAO/orbsvcs/tests/Security/Callback/Makefile.am index 43e645ea98f..ddae4acd2d8 100644 --- a/TAO/orbsvcs/tests/Security/Callback/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Callback/Makefile.am @@ -73,8 +73,8 @@ noinst_HEADERS = \ ## Makefile.Callback_Security_Client.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -105,13 +105,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Makefile.Callback_Security_Server.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -142,8 +142,8 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am index 3993d9dd02a..e2535550e7e 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am @@ -50,9 +50,9 @@ noinst_HEADERS = \ ## Makefile.Security_Crash_Test_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -89,17 +89,17 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Security_Crash_Test_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -138,9 +138,9 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am index 68fcc5c24a8..059b8959b54 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am @@ -16,6 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = ## Makefile.MT_IIOP_SSL_Idl.am @@ -48,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.MT_IIOP_SSL_Security_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -70,12 +73,14 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.MT_IIOP_SSL_Security_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -116,9 +121,9 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am index 030b9393b4b..ee4b9bc4074 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am @@ -49,8 +49,8 @@ noinst_HEADERS = \ ## Makefile.MT_SSLIOP_Security_Client.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -79,13 +79,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Makefile.MT_SSLIOP_Security_Server.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -119,8 +119,8 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am index 3dadc41e4e1..6091c6766ac 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am @@ -50,6 +50,7 @@ noinst_HEADERS = \ ## Makefile.Secure_Invocation_Security_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS noinst_PROGRAMS += client @@ -78,14 +79,15 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Secure_Invocation_Security_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -123,9 +125,9 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am index 220499d6f56..16579cdac4c 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.Corbaloc_Ssliop_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ test_objectC.cpp \ test_objectC.h \ @@ -79,6 +82,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am index 01c8adb2ce2..a0db8b90c16 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.Simple_Naming_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ test_objectC.cpp \ test_objectC.h \ @@ -79,6 +82,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Time/Makefile.am b/TAO/orbsvcs/tests/Time/Makefile.am index 1c540fee207..6beaf43556d 100644 --- a/TAO/orbsvcs/tests/Time/Makefile.am +++ b/TAO/orbsvcs/tests/Time/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Time_Orbsvcs_Client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -39,6 +42,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Trading/Makefile.am b/TAO/orbsvcs/tests/Trading/Makefile.am index c07c73d2a91..4f692d0fb2a 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile.am +++ b/TAO/orbsvcs/tests/Trading/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Trading_Test_Lib.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ TTestC.cpp \ TTestC.h \ @@ -44,7 +48,7 @@ CLEANFILES = \ TTestC.cpp TTestC.h TTestC.inl TTestS.cpp TTestS.h TTestS.inl TTestS_T.cpp TTestS_T.h TTestS_T.inl: TTest-stamp TTest-stamp: $(srcdir)/TTest.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -I..\..\.. -I..\..\..\orbsvcs -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl @touch $@ noinst_LTLIBRARIES = libTTest.la @@ -83,9 +87,13 @@ noinst_HEADERS = \ TTestS_T.inl \ ttest_export.h +endif BUILD_EXCEPTIONS + ## Makefile.Trading_Colocated_Test.am -noinst_PROGRAMS = colocated_test +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += colocated_test colocated_test_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -113,6 +121,7 @@ colocated_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ @@ -121,8 +130,12 @@ colocated_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Trading_Export_Test.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += export_test export_test_CPPFLAGS = \ @@ -151,6 +164,7 @@ export_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ @@ -159,8 +173,12 @@ export_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Trading_Import_Test.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += import_test import_test_CPPFLAGS = \ @@ -189,6 +207,7 @@ import_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ @@ -197,6 +216,8 @@ import_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am index 52542ab8cec..ac7e92333bb 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am +++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.ior_corbaname_idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.ior_corbaname_client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -70,8 +74,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.ior_corbaname_server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -96,6 +104,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am b/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am index 57d76e66aeb..31eae6825ea 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am +++ b/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.tests_svc_loader.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = tests_svc_loader @@ -33,7 +33,7 @@ tests_svc_loader_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: |