diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-17 06:42:10 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-17 06:42:10 +0000 |
| commit | 141e21a2b09adb58b0124e162f106e0dd6a3ebd1 (patch) | |
| tree | 396f346d283258f64e41a2e73cca957775cc85c3 /TAO/orbsvcs/tests | |
| parent | cbe5c97fcb14d1da0d91956870f015c4918ac85e (diff) | |
| download | ATCD-141e21a2b09adb58b0124e162f106e0dd6a3ebd1.tar.gz | |
ChangeLogTag: Mon Aug 16 23:35:00 2004 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/tests')
37 files changed, 1054 insertions, 168 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am index e02553a1d61..8447518a9f1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am @@ -5,6 +5,16 @@ ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) TAO_BUILDDIR = $(top_builddir) +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc + ## Makefile.AVS_Asynch_Three_Stage_Dist.am noinst_PROGRAMS = distributer @@ -14,7 +24,8 @@ distributer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs distributer_SOURCES = \ Connection_Manager.cpp \ @@ -36,7 +47,6 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Asynch_Three_Stage_Recv.am noinst_PROGRAMS += receiver @@ -46,7 +56,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ Connection_Manager.cpp \ @@ -68,7 +79,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Asynch_Three_Stage_Send.am noinst_PROGRAMS += sender @@ -78,7 +88,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ Connection_Manager.cpp \ @@ -100,7 +111,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am index e63709c363b..195afa6bdd3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -34,7 +35,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Bidirectional_Flows_Send.am noinst_PROGRAMS += sender @@ -44,7 +44,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -64,7 +65,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am index f4afd61e9bc..a4664246dac 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am @@ -14,7 +14,8 @@ distributer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs distributer_SOURCES = \ Connection_Manager.cpp \ @@ -37,7 +38,6 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Component_Switching_Recv.am noinst_PROGRAMS += receiver @@ -47,7 +47,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ Connection_Manager.cpp \ @@ -70,7 +71,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Component_Switching_Send.am noinst_PROGRAMS += sender @@ -80,7 +80,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ Connection_Manager.cpp \ @@ -103,7 +104,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am index e585bf4e19e..9e52a0cf7cb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am @@ -14,7 +14,8 @@ ftp_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -34,7 +35,6 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Full_Profile_Server.am noinst_PROGRAMS += server @@ -44,7 +44,8 @@ server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -64,7 +65,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am index 99cd5bcf5a8..0978806705a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -14,7 +14,8 @@ control_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs control_SOURCES = \ control.cpp \ @@ -36,7 +37,6 @@ control_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Latency_Ping.am noinst_PROGRAMS += ping @@ -46,7 +46,8 @@ ping_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ping_SOURCES = \ ping.cpp \ @@ -67,7 +68,6 @@ ping_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Latency_Pong.am noinst_PROGRAMS += pong @@ -77,7 +77,8 @@ pong_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs pong_SOURCES = \ pong.cpp \ @@ -98,7 +99,6 @@ pong_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am index 0a0c89c382e..245561c428c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -34,7 +35,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Modify_QoS_Send.am noinst_PROGRAMS += sender @@ -44,7 +44,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -64,7 +65,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am index 95f87455e70..5d52b17d032 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am @@ -14,7 +14,8 @@ ftp_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -35,7 +36,6 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Multicast_Server.am noinst_PROGRAMS += server @@ -45,7 +45,8 @@ server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -66,7 +67,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am index dc3ba158308..36bc7cdd736 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am @@ -14,7 +14,8 @@ ftp_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -34,7 +35,6 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Multicast_Full_Profile_Server.am noinst_PROGRAMS += server @@ -44,7 +44,8 @@ server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -64,7 +65,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am index 612213b6667..2603cbf1d05 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -34,7 +35,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Multiple_Flows_Send.am noinst_PROGRAMS += sender @@ -44,7 +44,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -64,7 +65,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am index e15550759ae..ab0b6dd507d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am @@ -14,7 +14,8 @@ ftp_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -34,7 +35,6 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Pluggable_Server.am noinst_PROGRAMS += server @@ -44,7 +44,8 @@ server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -64,7 +65,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am index 7165f405716..1d6ff7869d7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -34,7 +35,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Pluggable_Flow_Protocol_Send.am noinst_PROGRAMS += sender @@ -44,7 +44,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -64,7 +65,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Pluggable_Flow_Protocol_Ts.am noinst_LTLIBRARIES = libTAO_TS.la @@ -74,12 +74,16 @@ libTAO_TS_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_TS_BUILD_DLL libTAO_TS_la_SOURCES = \ TimeStamp.cpp +libTAO_TS_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + libTAO_TS_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -97,7 +101,6 @@ libTAO_TS_la_LIBADD = \ noinst_HEADERS = \ TimeStamp.h - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am index 671561ad517..953c963e715 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am @@ -14,7 +14,8 @@ distributer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs distributer_SOURCES = \ distributer.cpp \ @@ -34,7 +35,6 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Simple_Three_Stage_Recv.am noinst_PROGRAMS += receiver @@ -44,7 +44,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -64,7 +65,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Simple_Three_Stage_Send.am noinst_PROGRAMS += sender @@ -74,7 +74,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -94,7 +95,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am index 475c4d4f900..b7339afac32 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ Receiver_Stats.cpp \ @@ -37,7 +38,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Simple_Two_Stage_Send.am noinst_PROGRAMS += sender @@ -47,7 +47,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -68,7 +69,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core 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 7bf759f736b..734de95905b 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 @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -34,7 +35,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Simple_Two_Stage_With_QoS_Send.am noinst_PROGRAMS += sender @@ -44,7 +44,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -64,7 +65,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am index 38dc7bcfcc7..a7054b404fa 100644 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am @@ -5,15 +5,15 @@ ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) TAO_BUILDDIR = $(top_builddir) -## Makefile.Bug_1334_client.am - noinst_PROGRAMS = client client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs client_SOURCES = \ client.cpp @@ -30,7 +30,6 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am index cf2ca94a89e..c816780f1b1 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile.am +++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am @@ -14,7 +14,8 @@ CC_client_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs CC_client_SOURCES = \ CC_client.cpp \ @@ -45,7 +46,6 @@ CC_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am index ce5c177e953..38c6ae46c72 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am @@ -8,15 +8,16 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.CosEvent_Basic_Disconnect.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = Disconnect -endif Disconnect_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -41,19 +42,21 @@ Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent_Basic_MT_Disconnect.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += MT_Disconnect -endif MT_Disconnect_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -77,19 +80,21 @@ MT_Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent_Basic_Pull_Push_Event.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += Pull_Push_Event -endif Pull_Push_Event_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -114,19 +119,21 @@ Pull_Push_Event_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent_Basic_Push_Event.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += Push_Event -endif Push_Event_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -151,19 +158,21 @@ Push_Event_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent_Basic_Random.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += Random -endif Random_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -187,19 +196,21 @@ Random_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent_Basic_Shutdown.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += Shutdown -endif Shutdown_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -224,6 +235,7 @@ Shutdown_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am index 757279b7492..b21894e7567 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am @@ -8,15 +8,16 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.CosEvent_Test_Lib.am if !BUILD_MINIMUM_CORBA + noinst_LTLIBRARIES = libCECTests.la -endif libCECTests_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DCEC_TEST_BUILD_DLL @@ -24,6 +25,9 @@ libCECTests_la_SOURCES = \ Counting_Consumer.cpp \ Counting_Supplier.cpp +libCECTests_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + libCECTests_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -44,6 +48,7 @@ noinst_HEADERS = \ Counting_Supplier.h \ cectest_export.h +endif !BUILD_MINIMUM_CORBA ## 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 aa24eaca5e9..432cfbb2b39 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am @@ -34,7 +34,7 @@ CLEANFILES = \ dataS_T.cpp dataC.inl dataS.inl dataS_T.inl dataC.cpp dataS.cpp dataC.h dataS.h dataS_T.h: data-stamp data-stamp: $(srcdir)/data.idl - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/data.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl @touch $@ ## Makefile.ECM_Consumer.am @@ -46,7 +46,8 @@ ECM_Consumer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ECM_Consumer_SOURCES = \ ECM_Consumer.cpp \ @@ -76,7 +77,6 @@ ECM_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.ECM_Supplier.am noinst_PROGRAMS += ECM_Supplier @@ -86,7 +86,8 @@ ECM_Supplier_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ECM_Supplier_SOURCES = \ ECM_Data.cpp \ @@ -116,7 +117,6 @@ ECM_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am index 21e3424ac6f..a41e44f1a7c 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am @@ -14,7 +14,8 @@ MCast_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs MCast_SOURCES = \ AddrServer.cpp \ @@ -36,7 +37,6 @@ MCast_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am index b26b7e51c7c..b4bb647e8b5 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am @@ -14,7 +14,8 @@ EC_Mcast_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs EC_Mcast_SOURCES = \ EC_Mcast.cpp \ @@ -32,7 +33,6 @@ EC_Mcast_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am index d79ab602c6c..772c238f75e 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am @@ -14,7 +14,8 @@ EC_Multiple_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs EC_Multiple_SOURCES = \ EC_Multiple.cpp \ @@ -39,7 +40,6 @@ EC_Multiple_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am index 9d5adc97051..2837a6fa503 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am @@ -14,7 +14,8 @@ ECT_Consumer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ECT_Consumer_SOURCES = \ ECT_Consumer.cpp \ @@ -40,7 +41,6 @@ ECT_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.ECT_Supplier.am noinst_PROGRAMS += ECT_Supplier @@ -50,7 +50,8 @@ ECT_Supplier_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ECT_Supplier_SOURCES = \ ECT_Driver.cpp \ @@ -76,7 +77,6 @@ ECT_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.ECT_Throughput.am noinst_PROGRAMS += ECT_Throughput @@ -86,7 +86,8 @@ ECT_Throughput_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ECT_Throughput_SOURCES = \ ECT_Consumer.cpp \ @@ -114,7 +115,6 @@ ECT_Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index f2709068268..ca4231f0ae4 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -14,7 +14,8 @@ Atomic_Reconnect_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Atomic_Reconnect_SOURCES = \ @@ -35,7 +36,6 @@ Atomic_Reconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_BCast.am noinst_PROGRAMS += BCast @@ -45,7 +45,8 @@ BCast_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib BCast_SOURCES = \ @@ -66,7 +67,6 @@ BCast_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Bitmask.am noinst_PROGRAMS += Bitmask @@ -76,7 +76,8 @@ Bitmask_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Bitmask_SOURCES = \ @@ -105,7 +106,6 @@ Bitmask_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Complex.am noinst_PROGRAMS += Complex @@ -115,7 +115,8 @@ Complex_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Complex_SOURCES = \ @@ -144,7 +145,6 @@ Complex_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Control.am noinst_PROGRAMS += Control @@ -154,7 +154,8 @@ Control_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Control_SOURCES = \ @@ -175,7 +176,6 @@ Control_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Disconnect.am noinst_PROGRAMS += Disconnect @@ -185,7 +185,8 @@ Disconnect_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Disconnect_SOURCES = \ @@ -214,7 +215,6 @@ Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Gateway.am noinst_PROGRAMS += Gateway @@ -224,7 +224,8 @@ Gateway_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Gateway_SOURCES = \ @@ -253,7 +254,6 @@ Gateway_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_MT_Disconnect.am noinst_PROGRAMS += MT_Disconnect @@ -263,7 +263,8 @@ MT_Disconnect_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib MT_Disconnect_SOURCES = \ @@ -284,7 +285,6 @@ MT_Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Negation.am noinst_PROGRAMS += Negation @@ -294,7 +294,8 @@ Negation_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Negation_SOURCES = \ @@ -323,7 +324,6 @@ Negation_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Observer.am noinst_PROGRAMS += Observer @@ -333,7 +333,8 @@ Observer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Observer_SOURCES = \ @@ -354,7 +355,6 @@ Observer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Random.am noinst_PROGRAMS += Random @@ -364,7 +364,8 @@ Random_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Random_SOURCES = \ @@ -385,7 +386,6 @@ Random_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Reconnect.am noinst_PROGRAMS += Reconnect @@ -395,7 +395,8 @@ Reconnect_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Reconnect_SOURCES = \ @@ -416,7 +417,6 @@ Reconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Shutdown.am noinst_PROGRAMS += Shutdown @@ -426,7 +426,8 @@ Shutdown_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Shutdown_SOURCES = \ @@ -447,7 +448,6 @@ Shutdown_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Timeout.am noinst_PROGRAMS += Timeout @@ -457,7 +457,8 @@ Timeout_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Timeout_SOURCES = \ @@ -486,7 +487,6 @@ Timeout_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Wildcard.am noinst_PROGRAMS += Wildcard @@ -496,7 +496,8 @@ Wildcard_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Wildcard_SOURCES = \ @@ -525,7 +526,6 @@ Wildcard_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am index 9f88c550b34..4249932b792 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am @@ -14,7 +14,8 @@ libECMcastTests_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DECMCASTTESTS_BUILD_DLL libECMcastTests_la_SOURCES = \ @@ -22,7 +23,7 @@ libECMcastTests_la_SOURCES = \ Gateway_EC.cpp libECMcastTests_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libECMcastTests_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -40,7 +41,6 @@ noinst_HEADERS = \ EC_Wrapper.h \ Gateway_EC.h - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am index 6395dfb9936..7d56841b64b 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am @@ -5,8 +5,6 @@ ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) TAO_BUILDDIR = $(top_builddir) -## Makefile.Complex_Consumer.am - noinst_PROGRAMS = consumer consumer_CPPFLAGS = \ @@ -14,7 +12,8 @@ consumer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common consumer_SOURCES = \ @@ -35,7 +34,6 @@ consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Complex_Gateway_Ec.am noinst_PROGRAMS += gateway-ec @@ -45,7 +43,8 @@ gateway_ec_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common gateway_ec_SOURCES = \ @@ -66,7 +65,6 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Complex_Supplier.am noinst_PROGRAMS += supplier @@ -76,7 +74,8 @@ supplier_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common supplier_SOURCES = \ @@ -97,7 +96,6 @@ supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am index 6560e5416ff..fd1467059b8 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am @@ -14,7 +14,8 @@ gateway_ec_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common gateway_ec_SOURCES = \ @@ -35,7 +36,6 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Simple_Supplier.am noinst_PROGRAMS += supplier @@ -45,7 +45,8 @@ supplier_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common supplier_SOURCES = \ @@ -66,7 +67,6 @@ supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am index a0691634910..0183cbdb41c 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am @@ -14,7 +14,8 @@ application_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common application_SOURCES = \ @@ -35,7 +36,6 @@ application_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Two_Way_Gateway_Ec.am noinst_PROGRAMS += gateway-ec @@ -45,7 +45,8 @@ gateway_ec_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common gateway_ec_SOURCES = \ @@ -66,7 +67,6 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am index 4126f3139d0..d76b9aaf282 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am @@ -14,7 +14,8 @@ Connect_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Connect_SOURCES = \ @@ -35,7 +36,6 @@ Connect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Performance_Inversion.am noinst_PROGRAMS += Inversion @@ -45,7 +45,8 @@ Inversion_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Inversion_SOURCES = \ @@ -66,7 +67,6 @@ Inversion_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Performance_Latency.am noinst_PROGRAMS += Latency @@ -76,7 +76,8 @@ Latency_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Latency_SOURCES = \ @@ -98,7 +99,6 @@ Latency_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Performance_Latency_Server.am noinst_PROGRAMS += Latency_Server @@ -108,7 +108,8 @@ Latency_Server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Latency_Server_SOURCES = \ @@ -133,7 +134,6 @@ Latency_Server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Performance_Throughput.am noinst_PROGRAMS += Throughput @@ -143,7 +143,8 @@ Throughput_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Throughput_SOURCES = \ @@ -164,7 +165,6 @@ Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am index 176e6a1f644..cd26a1691d4 100644 --- a/TAO/orbsvcs/tests/Event/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am @@ -14,7 +14,8 @@ libECTests_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DEC_TEST_BUILD_DLL libECTests_la_SOURCES = \ @@ -24,6 +25,9 @@ libECTests_la_SOURCES = \ Driver.cpp \ Supplier.cpp +libECTests_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + libECTests_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -46,7 +50,6 @@ noinst_HEADERS = \ ectest_export.h \ Driver.i - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am new file mode 100644 index 00000000000..2a9a6c56614 --- /dev/null +++ b/TAO/orbsvcs/tests/FT_App/Makefile.am @@ -0,0 +1,452 @@ +## Process this file with automake to create Makefile.in + +ACE_ROOT = $(top_srcdir)/.. +ACE_BUILDDIR = $(top_builddir)/.. +TAO_ROOT = $(top_srcdir) +TAO_BUILDDIR = $(top_builddir) + +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_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 + +## Makefile.FT_App_Analyzer.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS = ft_analyzer + +ft_analyzer_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_analyzer_SOURCES = \ + FTAPP_Analyzer_Main.cpp \ + StubBatchConsumer.cpp \ + StubFaultAnalyzer.cpp \ + StubFaultConsumer.cpp \ + StubBatchConsumer.h \ + StubFaultAnalyzer.h \ + StubFaultConsumer.h + +ft_analyzer_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_Server.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES = \ + FT_TestReplicaS_T.cpp \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h + +CLEANFILES = \ + FT_TestReplicaS_T.cpp \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h \ + FT_TestReplica-stamp + +FT_TestReplicaS_T.cpp FT_TestReplicaC.inl FT_TestReplicaS.inl FT_TestReplicaS_T.inl FT_TestReplicaC.cpp FT_TestReplicaS.cpp FT_TestReplicaC.h FT_TestReplicaS.h FT_TestReplicaS_T.h: FT_TestReplica-stamp + +FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl + @touch $@ + +noinst_PROGRAMS += ft_replica + +ft_replica_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_replica_SOURCES = \ + FT_Replica.cpp \ + FT_ReplicaFactory_i.cpp \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplica_i.cpp \ + FT_ReplicaFactory_i.h \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h \ + FT_TestReplica_i.h \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl + +ft_replica_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_Client.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES += \ + FT_TestReplicaS_T.cpp \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h + +CLEANFILES += \ + FT_TestReplicaS_T.cpp \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h \ + FT_TestReplica-stamp + +FT_TestReplicaS_T.cpp FT_TestReplicaC.inl FT_TestReplicaS.inl FT_TestReplicaS_T.inl FT_TestReplicaC.cpp FT_TestReplicaS.cpp FT_TestReplicaC.h FT_TestReplicaS.h FT_TestReplicaS_T.h: FT_TestReplica-stamp + +FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl + @touch $@ + +noinst_PROGRAMS += ft_client + +ft_client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_client_SOURCES = \ + FT_Client.cpp \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl + +ft_client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_Creator.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += ft_create + +ft_create_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_create_SOURCES = \ + FT_Creator.cpp \ + TAO_Object_Group_Creator.cpp \ + FT_Creator.h \ + TAO_Object_Group_Creator.h + +ft_create_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_FactoryRegistry.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += ft_registry + +ft_registry_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_registry_SOURCES = \ + FTAPP_FactoryRegistry_Main.cpp + +ft_registry_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_FaultConsumer.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += ft_fault_consumer + +ft_fault_consumer_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_fault_consumer_SOURCES = \ + FTAPP_FaultConsumer_Main.cpp \ + ReplicationManagerFaultConsumerAdapter.cpp \ + ReplicationManagerFaultConsumerAdapter.h + +ft_fault_consumer_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/FT_ReplicationManager/libTAO_ReplicationManagerLib.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_Notifier.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += ft_notifier + +ft_notifier_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_notifier_SOURCES = \ + FTAPP_Notifier_Main.cpp \ + StubFaultNotifier.cpp \ + StubFaultNotifier.h + +ft_notifier_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_RMController.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += replmgr_controller + +replmgr_controller_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +replmgr_controller_SOURCES = \ + FT_ReplicationManagerController.cpp \ + FT_Creator.h \ + FT_ReplicaFactory_i.h \ + FT_TestReplica_i.h \ + ReplicationManagerFaultConsumerAdapter.h \ + StubBatchConsumer.h \ + StubFaultAnalyzer.h \ + StubFaultConsumer.h \ + StubFaultNotifier.h \ + TAO_Object_Group_Creator.h + +replmgr_controller_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -f gcctemp.c gcctemp so_locations + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am new file mode 100644 index 00000000000..d5fb0b59a6f --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am @@ -0,0 +1,132 @@ +## Process this file with automake to create Makefile.in + +ACE_ROOT = $(top_srcdir)/.. +ACE_BUILDDIR = $(top_builddir)/.. +TAO_ROOT = $(top_srcdir) +TAO_BUILDDIR = $(top_builddir) + +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_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 + +## Makefile.GroupRef_Manipulation_Client.am + +if BUILD_ACE_UUID +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES = \ + testS_T.cpp \ + testC.inl \ + testS.inl \ + testS_T.inl \ + testC.cpp \ + testC.h \ + testS.h \ + testS_T.h + +CLEANFILES = \ + testS_T.cpp \ + testC.inl \ + testS.inl \ + testS_T.inl \ + testC.cpp \ + testC.h \ + testS.h \ + testS_T.h \ + test-stamp + +testS_T.cpp testC.inl testS.inl testS_T.inl testC.cpp testC.h testS.h testS_T.h: test-stamp + +test-stamp: $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Gv -DCORBA3 -I$(TAO_ROOT) $(srcdir)/test.idl + @touch $@ + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + testC.h \ + testS_T.h \ + testC.inl \ + testS_T.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_ACE_UUID + +## Makefile.GroupRef_Manipulation_Server.am + +if BUILD_ACE_UUID +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +server_SOURCES = \ + Server_ORBInitializer.cpp \ + Server_Request_Interceptor.cpp \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + Server_ORBInitializer.h \ + Server_Request_Interceptor.h \ + testC.h \ + testS.h \ + testS_T.h \ + test_i.h \ + testC.inl \ + testS.inl \ + testS_T.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -f gcctemp.c gcctemp so_locations + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am new file mode 100644 index 00000000000..3070cdc2167 --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am @@ -0,0 +1,125 @@ +## Process this file with automake to create Makefile.in + +ACE_ROOT = $(top_srcdir)/.. +ACE_BUILDDIR = $(top_builddir)/.. +TAO_ROOT = $(top_srcdir) +TAO_BUILDDIR = $(top_builddir) + +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_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 + +## Makefile.FaultTolerance_IOGR_Manager.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES = \ + testS_T.cpp \ + testC.inl \ + testS.inl \ + testS_T.inl \ + testC.cpp \ + testC.h \ + testS.h \ + testS_T.h + +CLEANFILES = \ + testS_T.cpp \ + testC.inl \ + testS.inl \ + testS_T.inl \ + testC.cpp \ + testC.h \ + testS.h \ + testS_T.h \ + test-stamp + +testS_T.cpp testC.inl testS.inl testS_T.inl testC.cpp testC.h testS.h testS_T.h: test-stamp + +test-stamp: $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test.idl + @touch $@ + +noinst_PROGRAMS = Manager + +Manager_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +Manager_SOURCES = \ + Manager.cpp \ + testC.cpp \ + Manager.h \ + testC.h \ + testS_T.h \ + testC.inl \ + testS_T.inl + +Manager_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FaultTolerance_IOGR_Server.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + testC.h \ + testS.h \ + testS_T.h \ + test_i.h \ + testC.inl \ + testS.inl \ + testS_T.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -f gcctemp.c gcctemp so_locations + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am new file mode 100644 index 00000000000..f0852efee56 --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am @@ -0,0 +1,46 @@ +## Process this file with automake to create Makefile.in + +ACE_ROOT = $(top_srcdir)/.. +ACE_BUILDDIR = $(top_builddir)/.. +TAO_ROOT = $(top_srcdir) +TAO_BUILDDIR = $(top_builddir) + +## Makefile.IOGRTest.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS = IOGRTest + +IOGRTest_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +IOGRTest_SOURCES = \ + IOGRTest.cpp + +IOGRTest_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -f gcctemp.c gcctemp so_locations + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/FaultTolerance/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/Makefile.am new file mode 100644 index 00000000000..c795a8c0d13 --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/Makefile.am @@ -0,0 +1,7 @@ +## Process this file with automake to create Makefile.in + +SUBDIRS = \ + GroupRef_Manipulation \ + IOGR \ + IOGRManipulation + diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am new file mode 100644 index 00000000000..294ecbf9623 --- /dev/null +++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am @@ -0,0 +1,94 @@ +## Process this file with automake to create Makefile.in + +ACE_ROOT = $(top_srcdir)/.. +ACE_BUILDDIR = $(top_builddir)/.. +TAO_ROOT = $(top_srcdir) +TAO_BUILDDIR = $(top_builddir) + +## Makefile.FtRtEvent_Consumer.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS = consumer + +consumer_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +consumer_SOURCES = \ + PushConsumer.cpp \ + consumer.cpp \ + PushConsumer.h + +consumer_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FtRtEvent_Supplier.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += supplier + +supplier_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +supplier_SOURCES = \ + PushSupplier.cpp \ + supplier.cpp \ + PushSupplier.h + +supplier_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -f gcctemp.c gcctemp so_locations + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am index 620507784de..d3602d257d0 100644 --- a/TAO/orbsvcs/tests/Makefile.am +++ b/TAO/orbsvcs/tests/Makefile.am @@ -13,11 +13,11 @@ SUBDIRS = \ EC_Mcast \ EC_Multiple \ EC_Throughput \ - Event + Event \ + FT_App \ + FaultTolerance \ + FtRtEvent -# FT_App \ -# FaultTolerance \ -# FtRtEvent \ # IOR_MCast \ # ImplRepo \ # InterfaceRepo \ |