diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-22 19:36:07 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-22 19:36:07 +0000 |
| commit | d1220c04a672b0d9e8aa88ad9db4cb4232ad9f3c (patch) | |
| tree | 8439c79ea851d30b1e22f54cff50a4db55fa763a /TAO/orbsvcs | |
| parent | efd0a30939df357ba466ea8ecf2f06532a3cc74b (diff) | |
| download | ATCD-d1220c04a672b0d9e8aa88ad9db4cb4232ad9f3c.tar.gz | |
ChangeLogTag: Mon Aug 22 12:32:42 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs')
35 files changed, 507 insertions, 186 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am index 096d474afb3..8bf1b60334e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -31,6 +36,7 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -57,6 +63,7 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -83,6 +90,7 @@ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am index d59ea769342..aedbee83095 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -29,6 +34,7 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -53,6 +59,7 @@ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am index 1d6386142bd..1ccbdb0d158 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -32,6 +37,7 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -59,6 +65,7 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -86,6 +93,7 @@ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am index 30902327c77..b2a49c5be6f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -29,6 +34,7 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -53,6 +59,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am index 70862fc5bed..13acdafc5f5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -31,6 +36,7 @@ control_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -56,6 +62,7 @@ ping_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -81,6 +88,7 @@ pong_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am index e8a3d7074e1..5c8784748f7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -29,6 +34,7 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -53,6 +59,7 @@ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am index 915f1d77e6b..e025da06b15 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -30,6 +35,7 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -55,6 +61,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am index 94651be0b2e..ce0e908934c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -29,6 +34,7 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -53,6 +59,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am index bd568e60145..bb8aa7a8ad9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -29,6 +34,7 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -53,6 +59,7 @@ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am index 0a9dc46472b..676cfc94657 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -29,6 +34,7 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -53,6 +59,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am index c814a0de509..74ec6847a33 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -29,6 +34,7 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -53,6 +59,7 @@ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -72,17 +79,6 @@ libTAO_TS_la_CPPFLAGS = \ 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 \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - noinst_HEADERS = \ TimeStamp.h diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am index be6ec066da4..96346ff3441 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -29,6 +34,7 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -53,6 +59,7 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -77,6 +84,7 @@ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am index f9f9c992aad..325e5280f52 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -24,14 +29,15 @@ receiver_SOURCES = \ Receiver_Stats.cpp \ receiver.cpp \ Receiver_Stats.h \ - receiver.h \ - Receiver_Stats.inl + Receiver_Stats.inl \ + receiver.h receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -49,14 +55,15 @@ sender_CPPFLAGS = \ sender_SOURCES = \ sender.cpp \ - sender.h \ - Receiver_Stats.inl + Receiver_Stats.inl \ + sender.h sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la 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 bbe263afa87..b2448e687b8 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 @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -29,6 +34,7 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -53,6 +59,7 @@ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am index e0677dece11..cdb0859a78d 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -11,37 +16,33 @@ TAO_ROOT = $(top_srcdir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(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 -## Makefile.BiDirCORBALOC_Server.am - BUILT_SOURCES = \ - TimeModuleC.inl \ - TimeModuleS.inl \ - TimeModuleS_T.inl \ + TimeModuleC.cpp \ TimeModuleC.h \ + TimeModuleC.inl \ + TimeModuleS.cpp \ TimeModuleS.h \ + TimeModuleS.inl \ + TimeModuleS_T.cpp \ TimeModuleS_T.h \ - TimeModuleC.cpp \ - TimeModuleS.cpp \ - TimeModuleA.cpp \ - TimeModuleS_T.cpp + TimeModuleS_T.inl CLEANFILES = \ TimeModule-stamp \ - TimeModuleC.inl \ - TimeModuleS.inl \ - TimeModuleS_T.inl \ + TimeModuleC.cpp \ TimeModuleC.h \ + TimeModuleC.inl \ + TimeModuleS.cpp \ TimeModuleS.h \ + TimeModuleS.inl \ + TimeModuleS_T.cpp \ TimeModuleS_T.h \ - TimeModuleC.cpp \ - TimeModuleS.cpp \ - TimeModuleA.cpp \ - TimeModuleS_T.cpp + TimeModuleS_T.inl -TimeModuleC.inl TimeModuleS.inl TimeModuleS_T.inl TimeModuleC.h TimeModuleS.h TimeModuleS_T.h TimeModuleC.cpp TimeModuleS.cpp TimeModuleA.cpp TimeModuleS_T.cpp: TimeModule-stamp +TimeModuleC.cpp TimeModuleC.h TimeModuleC.inl TimeModuleS.cpp TimeModuleS.h TimeModuleS.inl TimeModuleS_T.cpp TimeModuleS_T.h TimeModuleS_T.inl: TimeModule-stamp TimeModule-stamp: $(srcdir)/TimeModule.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GA $(srcdir)/TimeModule.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/TimeModule.idl @touch $@ noinst_PROGRAMS = TimeServer @@ -55,22 +56,23 @@ TimeServer_CPPFLAGS = \ -I$(TAO_BUILDDIR)/orbsvcs TimeServer_SOURCES = \ - TimeModuleA.cpp \ TimeModuleC.cpp \ TimeModuleS.cpp \ TimeServer.cpp \ TimeModuleC.h \ + TimeModuleC.inl \ TimeModuleS.h \ TimeModuleS_T.h \ - TimeModuleC.inl \ - TimeModuleS.inl \ TimeModuleS_T.inl TimeServer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am index a7054b404fa..fcc3bf38bc1 100644 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am @@ -1,9 +1,18 @@ ## 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 -noreldefs TAO.mwc -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + noinst_PROGRAMS = client @@ -20,18 +29,14 @@ client_SOURCES = \ client_LDADD = \ $(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_AnyTypeCode.la \ $(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 - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am index c9651348e0c..a4f24e436e7 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am @@ -1,11 +1,18 @@ ## 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 -noreldefs TAO.mwc -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.Bug_1393_Regression_Client.am noinst_PROGRAMS = client @@ -20,12 +27,14 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(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 - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am index a1c8da1a0f0..025bfa75d32 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am @@ -1,40 +1,53 @@ ## 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 -noreldefs TAO.mwc -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_builddir)/TAO_IDL/tao_idl +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(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 +## Makefile.Bug_1395_Regression_IDL.am + BUILT_SOURCES = \ - TestS_T.cpp \ TestC.cpp \ TestC.h \ - TestS.h \ - TestS_T.h \ TestC.inl \ + TestS.cpp \ + TestS.h \ TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ TestS_T.inl CLEANFILES = \ - TestS_T.cpp \ + Test-stamp \ TestC.cpp \ TestC.h \ - TestS.h \ - TestS_T.h \ TestC.inl \ + TestS.cpp \ + TestS.h \ TestS.inl \ - TestS_T.inl \ - Test-stamp + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl -TestS_T.cpp TestC.cpp TestC.h TestS.h TestS_T.h TestC.inl TestS.inl TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl @touch $@ + ## Makefile.Bug_1395_Regression_Client.am noinst_PROGRAMS = client @@ -48,16 +61,12 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestS_T.h \ - TestC.inl \ - TestS_T.inl + Test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Bug_1395_Regression_Server.am noinst_PROGRAMS += server @@ -73,26 +82,19 @@ server_SOURCES = \ TestS.cpp \ Test_i.cpp \ server.cpp \ - TestC.h \ - TestS.h \ - TestS_T.h \ - Test_i.h \ - TestC.inl \ - TestS.inl \ - TestS_T.inl + Test_i.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.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_AnyTypeCode.la \ $(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 - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am index 089fdde2c62..1d782e7a5e2 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am @@ -1,15 +1,23 @@ ## 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 -noreldefs TAO.mwc -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + -## Makefile.Bug_1630_testclient.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = testclient -endif testclient_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -21,13 +29,17 @@ testclient_SOURCES = \ testclient.cpp testclient_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + -lTAO_IFR_Client \ + -lTAO_AnyTypeCode \ + -lTAO \ + -lACE +endif !BUILD_MINIMUM_CORBA ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am index 805acfafd79..d4c356aff60 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile.am +++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am @@ -1,11 +1,18 @@ ## 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 -noreldefs TAO.mwc -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.CC_client.am noinst_PROGRAMS = CC_client @@ -33,20 +40,19 @@ CC_client_SOURCES = \ CC_tests.h CC_client_LDADD = \ - $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.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_AnyTypeCode.la \ $(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 - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am index 54d0e60fd8e..1ff66ea3452 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am @@ -1,15 +1,26 @@ ## 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 -noreldefs TAO.mwc -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.CosEvent_Basic_Disconnect.am +noinst_PROGRAMS = +## Makefile.CosEvent_Basic_Disconnect.am + +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = Disconnect +noinst_PROGRAMS += Disconnect Disconnect_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -29,23 +40,28 @@ Disconnect_SOURCES = \ Disconnect_LDADD = \ ../lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING -## Makefile.CosEvent_Basic_MT_Disconnect.am +## Makefile.CosEvent_Basic_MT_Disconnect.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += MT_Disconnect @@ -67,23 +83,28 @@ MT_Disconnect_SOURCES = \ MT_Disconnect_LDADD = \ ../lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING -## Makefile.CosEvent_Basic_Pull_Push_Event.am +## Makefile.CosEvent_Basic_Pull_Push_Event.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Pull_Push_Event @@ -106,23 +127,28 @@ Pull_Push_Event_SOURCES = \ Pull_Push_Event_LDADD = \ ../lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING -## Makefile.CosEvent_Basic_Push_Event.am +## Makefile.CosEvent_Basic_Push_Event.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Push_Event @@ -145,23 +171,28 @@ Push_Event_SOURCES = \ Push_Event_LDADD = \ ../lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING -## Makefile.CosEvent_Basic_Random.am +## Makefile.CosEvent_Basic_Random.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Random @@ -183,23 +214,28 @@ Random_SOURCES = \ Random_LDADD = \ ../lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING -## Makefile.CosEvent_Basic_Shutdown.am +## Makefile.CosEvent_Basic_Shutdown.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Shutdown @@ -222,23 +258,29 @@ Shutdown_SOURCES = \ Shutdown_LDADD = \ ../lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am index b21894e7567..e93b44d2338 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am @@ -1,11 +1,19 @@ ## 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 -noreldefs TAO.mwc -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + -## Makefile.CosEvent_Test_Lib.am if !BUILD_MINIMUM_CORBA @@ -25,24 +33,6 @@ 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 \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.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.la \ - $(ACE_BUILDDIR)/ace/libACE.la - noinst_HEADERS = \ Counting_Consumer.h \ Counting_Supplier.h \ @@ -52,6 +42,8 @@ endif !BUILD_MINIMUM_CORBA ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc index efc8fca370d..d0e3410d7f6 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc @@ -1,11 +1,26 @@ // -*- MPC -*- // $Id$ +project(*IDL): rteventexe, rtsched, naming, iortable, messaging { + + IDL_Files { + data.idl + } + + custom_only = 1 +} + project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging { exename = ECM_Supplier Source_Files { ECM_Data.cpp ECM_Supplier.cpp + dataS.cpp + dataC.cpp + } + + after += *IDL + IDL_Files { } } @@ -14,6 +29,10 @@ project(ECM Consumer): rteventexe, rtsched, naming, iortable, messaging { Source_Files { ECM_Data.cpp ECM_Consumer.cpp + dataC.cpp } -} + after += *IDL + IDL_Files { + } +} diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am index 4ab94275997..3a1fcd6080f 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am @@ -6,57 +6,52 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(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 = CLEANFILES = BUILT_SOURCES = +## Makefile.ECM_Consumer.am + if BUILD_CORBA_MESSAGING BUILT_SOURCES += \ - dataS_T.inl \ - dataC.inl \ - dataS.inl \ + dataC.cpp \ dataC.h \ + dataC.inl \ + dataS.cpp \ dataS.h \ + dataS.inl \ + dataS_T.cpp \ dataS_T.h \ - dataC.cpp \ - dataS.cpp \ - dataS_T.cpp + dataS_T.inl CLEANFILES += \ data-stamp \ - dataS_T.inl \ - dataC.inl \ - dataS.inl \ + dataC.cpp \ dataC.h \ + dataC.inl \ + dataS.cpp \ dataS.h \ + dataS.inl \ + dataS_T.cpp \ dataS_T.h \ - dataC.cpp \ - dataS.cpp \ - dataS_T.cpp + dataS_T.inl -dataS_T.inl dataC.inl dataS.inl dataC.h dataS.h dataS_T.h dataC.cpp dataS.cpp dataS_T.cpp: data-stamp +dataC.cpp dataC.h dataC.inl dataS.cpp dataS.h dataS.inl dataS_T.cpp dataS_T.h dataS_T.inl: data-stamp data-stamp: $(srcdir)/data.idl $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl @touch $@ -endif - -## Makefile.ECM_Consumer.am - -if BUILD_CORBA_MESSAGING - noinst_PROGRAMS += ECM_Consumer ECM_Consumer_CPPFLAGS = \ @@ -75,9 +70,9 @@ ECM_Consumer_SOURCES = \ ECM_Consumer.h \ ECM_Data.h \ dataC.h \ + dataC.inl \ dataS.h \ dataS_T.h \ - dataC.inl \ dataS_T.inl ECM_Consumer_LDADD = \ @@ -88,8 +83,11 @@ ECM_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -99,6 +97,35 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING +BUILT_SOURCES += \ + dataC.cpp \ + dataC.h \ + dataC.inl \ + dataS.cpp \ + dataS.h \ + dataS.inl \ + dataS_T.cpp \ + dataS_T.h \ + dataS_T.inl + +CLEANFILES += \ + data-stamp \ + dataC.cpp \ + dataC.h \ + dataC.inl \ + dataS.cpp \ + dataS.h \ + dataS.inl \ + dataS_T.cpp \ + dataS_T.h \ + dataS_T.inl + +dataC.cpp dataC.h dataC.inl dataS.cpp dataS.h dataS.inl dataS_T.cpp dataS_T.h dataS_T.inl: data-stamp + +data-stamp: $(srcdir)/data.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl + @touch $@ + noinst_PROGRAMS += ECM_Supplier ECM_Supplier_CPPFLAGS = \ @@ -117,9 +144,9 @@ ECM_Supplier_SOURCES = \ ECM_Data.h \ ECM_Supplier.h \ dataC.h \ + dataC.inl \ dataS.h \ dataS_T.h \ - dataC.inl \ dataS_T.inl ECM_Supplier_LDADD = \ @@ -130,8 +157,11 @@ ECM_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am index ed658315c99..c9a97a6514a 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am @@ -6,13 +6,15 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + + if BUILD_CORBA_MESSAGING noinst_PROGRAMS = MCast @@ -40,8 +42,11 @@ MCast_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am index 91c852e7b0c..8d81ac71db0 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am @@ -6,13 +6,15 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + + if BUILD_CORBA_MESSAGING noinst_PROGRAMS = EC_Mcast @@ -36,8 +38,11 @@ EC_Mcast_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am index 4c34b4789b9..2a7aaae7cee 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am @@ -6,13 +6,15 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + + if BUILD_CORBA_MESSAGING noinst_PROGRAMS = EC_Multiple @@ -42,8 +44,11 @@ EC_Multiple_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am index aa470c41b13..921204ca91f 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am @@ -6,7 +6,7 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -45,8 +45,11 @@ ECT_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -82,8 +85,11 @@ ECT_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -122,8 +128,11 @@ ECT_Throughput_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index f0895ef4122..45e396da80a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -6,7 +6,7 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -43,8 +43,11 @@ Atomic_Reconnect_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -78,8 +81,11 @@ BCast_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -121,8 +127,11 @@ Bitmask_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -164,8 +173,11 @@ Complex_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -199,8 +211,11 @@ Control_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -242,8 +257,11 @@ Disconnect_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -285,8 +303,11 @@ Gateway_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -320,8 +341,11 @@ MT_Disconnect_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -363,8 +387,11 @@ Negation_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -398,8 +425,11 @@ Observer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -433,8 +463,11 @@ Random_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -468,8 +501,11 @@ Reconnect_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -503,8 +539,11 @@ Shutdown_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -546,8 +585,11 @@ Timeout_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -589,8 +631,11 @@ Wildcard_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am index c5fd07bb32d..3c04fd99d8c 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am @@ -6,7 +6,7 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -34,7 +34,8 @@ libECMcastTests_la_SOURCES = \ noinst_HEADERS = \ EC_Wrapper.h \ - Gateway_EC.h + Gateway_EC.h \ + ectest_export.h endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am index 50fc3ffe7e3..ec6674ee779 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am @@ -6,7 +6,7 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -42,8 +42,11 @@ consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -76,8 +79,11 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -110,8 +116,11 @@ supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am index f41964dafaa..0a14f5133d7 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am @@ -6,7 +6,7 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -42,8 +42,11 @@ consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -76,8 +79,11 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -110,8 +116,11 @@ supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am index 4404b172195..732fc34a51b 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am @@ -6,7 +6,7 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -42,8 +42,11 @@ application_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -76,8 +79,11 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am index ac6dc977cde..7b3fb1e7370 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am @@ -6,7 +6,7 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -43,8 +43,11 @@ Connect_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -78,8 +81,11 @@ Inversion_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -114,8 +120,11 @@ Latency_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -153,8 +162,11 @@ Latency_Server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -188,8 +200,11 @@ Throughput_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am index e655c581b5f..66b6435046c 100644 --- a/TAO/orbsvcs/tests/Event/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am @@ -6,13 +6,15 @@ ## 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 +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + + if BUILD_CORBA_MESSAGING noinst_LTLIBRARIES = libECTests.la |