diff options
Diffstat (limited to 'TAO')
21 files changed, 405 insertions, 513 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 02fcd678182..682142164c0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,31 @@ +Thu Nov 30 05:52:05 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * tests/Bug_2417_Regression/Makefile.am: + * tests/Bug_2654_Regression/Makefile.am: + * tests/Bug_2709_Regression/Makefile.am: + * tests/Hang_Shutdown/Makefile.am: + * tests/ICMG_Any_Bug/Makefile.am: + * tests/OctetSeq/Makefile.am: + * tests/Param_Test/Makefile.am: + * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am: + * tests/RTCORBA/Client_Propagated/Makefile.am: + * tests/Timeout/Makefile.am: + + Regenerated. + + * tests/Bug_2417_Regression/Bug_2417_Regression.mpc: + * tests/Bug_2654_Regression/Bug_2654_Regression.mpc: + * tests/Bug_2709_Regression/Bug_2709_Regression.mpc: + * tests/Hang_Shutdown/Hang.mpc: + * tests/ICMG_Any_Bug/Hello.mpc: + * tests/OctetSeq/OctetSeq.mpc: + * tests/Param_Test/Param_Test.mpc: + * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc: + * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc: + * tests/Timeout/Timeout.mpc: + + Split out IDL compilation into separate MPC project. + Thu Nov 30 05:48:30 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * configure.ac: diff --git a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc index 27d1cc5fd95..fee0918158e 100644 --- a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc +++ b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc @@ -1,11 +1,25 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, anytypecode { + IDL_Files { + publisher.idl + subscriber.idl + } + custom_only = 1 +} + project(*Server): taoserver, messaging, threads { + after += *idl Source_Files { publisher_impl.cpp + publisherS.cpp + publisherC.cpp + subscriberC.cpp server.cpp } + IDL_Files { + } } project(*Client): taoserver, threads { @@ -13,7 +27,11 @@ project(*Client): taoserver, threads { after += *Server Source_Files { subscriber_impl.cpp + subscriberS.cpp + subscriberC.cpp + publisherC.cpp client.cpp } + IDL_Files { + } } - diff --git a/TAO/tests/Bug_2417_Regression/Makefile.am b/TAO/tests/Bug_2417_Regression/Makefile.am index 692b99c2cb7..c30c2310bb9 100644 --- a/TAO/tests/Bug_2417_Regression/Makefile.am +++ b/TAO/tests/Bug_2417_Regression/Makefile.am @@ -20,11 +20,9 @@ noinst_PROGRAMS = CLEANFILES = BUILT_SOURCES = -## Makefile.Bug_2417_Regression_Server.am +## Makefile.Bug_2417_Regression_Idl.am -if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -if BUILD_THREADS BUILT_SOURCES += \ publisherC.cpp \ @@ -72,6 +70,19 @@ subscriber-stamp: $(srcdir)/subscriber.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/subscriber.idl @touch $@ + +noinst_HEADERS = \ + publisher.idl \ + subscriber.idl + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2417_Regression_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_THREADS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -86,16 +97,7 @@ server_SOURCES = \ publisher_impl.cpp \ server.cpp \ subscriberC.cpp \ - subscriberS.cpp \ - publisherC.h \ - publisherC.inl \ - publisherS.h \ - publisherS.inl \ - publisher_impl.h \ - subscriberC.h \ - subscriberC.inl \ - subscriberS.h \ - subscriberS.inl + publisher_impl.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -116,52 +118,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if BUILD_THREADS -BUILT_SOURCES += \ - publisherC.cpp \ - publisherC.h \ - publisherC.inl \ - publisherS.cpp \ - publisherS.h \ - publisherS.inl - -CLEANFILES += \ - publisher-stamp \ - publisherC.cpp \ - publisherC.h \ - publisherC.inl \ - publisherS.cpp \ - publisherS.h \ - publisherS.inl - -publisherC.cpp publisherC.h publisherC.inl publisherS.cpp publisherS.h publisherS.inl: publisher-stamp - -publisher-stamp: $(srcdir)/publisher.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/publisher.idl - @touch $@ - -BUILT_SOURCES += \ - subscriberC.cpp \ - subscriberC.h \ - subscriberC.inl \ - subscriberS.cpp \ - subscriberS.h \ - subscriberS.inl - -CLEANFILES += \ - subscriber-stamp \ - subscriberC.cpp \ - subscriberC.h \ - subscriberC.inl \ - subscriberS.cpp \ - subscriberS.h \ - subscriberS.inl - -subscriberC.cpp subscriberC.h subscriberC.inl subscriberS.cpp subscriberS.h subscriberS.inl: subscriber-stamp - -subscriber-stamp: $(srcdir)/subscriber.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/subscriber.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -173,18 +129,9 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ publisherC.cpp \ - publisherS.cpp \ subscriberC.cpp \ subscriberS.cpp \ subscriber_impl.cpp \ - publisherC.h \ - publisherC.inl \ - publisherS.h \ - publisherS.inl \ - subscriberC.h \ - subscriberC.inl \ - subscriberS.h \ - subscriberS.inl \ subscriber_impl.h client_LDADD = \ diff --git a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc b/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc index 70f0d60d81b..b151a3cbd1e 100644 --- a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc +++ b/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc @@ -1,21 +1,38 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, avoids_minimum_corba, bidir_giop { +project(*idl): taoidldefaults { idlflags += -Sa -St + IDL_Files { + Hello.idl + } + + custom_only = 1 +} + +project(*Server): taoserver, avoids_minimum_corba, bidir_giop { + after += *idl + Source_Files { Hello.cpp + HelloS.cpp + HelloC.cpp server.cpp } + IDL_Files { + } } project(*Client): taoclient, avoids_minimum_corba, messaging, bidir_giop { + after += *Server Source_Files { HelloS.cpp HelloC.cpp client.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2654_Regression/Makefile.am b/TAO/tests/Bug_2654_Regression/Makefile.am index f6970b0d4a7..3a0a9209cb8 100644 --- a/TAO/tests/Bug_2654_Regression/Makefile.am +++ b/TAO/tests/Bug_2654_Regression/Makefile.am @@ -17,15 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2654_Regression_Client.am +## Makefile.Bug_2654_Regression_Idl.am -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ +BUILT_SOURCES = \ HelloC.cpp \ HelloC.h \ HelloC.inl \ @@ -33,7 +28,7 @@ BUILT_SOURCES += \ HelloS.h \ HelloS.inl -CLEANFILES += \ +CLEANFILES = \ Hello-stamp \ HelloC.cpp \ HelloC.h \ @@ -45,96 +40,75 @@ CLEANFILES += \ HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Hello.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Hello.idl @touch $@ -noinst_PROGRAMS += client -client_CPPFLAGS = \ +noinst_HEADERS = \ + Hello.idl + +## Makefile.Bug_2654_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ HelloC.cpp \ HelloS.cpp \ - client.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl + server.cpp \ + Hello.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.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_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -## Makefile.Bug_2654_Regression_Server.am +## Makefile.Bug_2654_Regression_Client.am +if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -CLEANFILES += \ - Hello-stamp \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp - -Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Hello.idl - @touch $@ - -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ HelloC.cpp \ HelloS.cpp \ - server.cpp \ - Hello.h \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl + client.cpp \ + Hello.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.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_EXCEPTIONS +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/tests/Bug_2709_Regression/Bug_2709_Regression.mpc b/TAO/tests/Bug_2709_Regression/Bug_2709_Regression.mpc index 6f953f02b7d..327011d9a80 100644 --- a/TAO/tests/Bug_2709_Regression/Bug_2709_Regression.mpc +++ b/TAO/tests/Bug_2709_Regression/Bug_2709_Regression.mpc @@ -1,7 +1,15 @@ // -*- MPC -*- -// $Id:$ +// $Id$ + +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} project(*Client): taoserver, iortable, ftclientorb { + after += *idl exename = client Source_Files { TestS.cpp @@ -11,9 +19,12 @@ project(*Client): taoserver, iortable, ftclientorb { Server_Task.cpp TestImpl.cpp } + IDL_Files { + } } project(*Server): taoserver, iortable { + after += *Client exename = server Source_Files { TestC.cpp @@ -22,5 +33,6 @@ project(*Server): taoserver, iortable { Server_Task.cpp TestImpl.cpp } + IDL_Files { + } } - diff --git a/TAO/tests/Bug_2709_Regression/Makefile.am b/TAO/tests/Bug_2709_Regression/Makefile.am index c2dc4cea5cf..879f0dd283b 100644 --- a/TAO/tests/Bug_2709_Regression/Makefile.am +++ b/TAO/tests/Bug_2709_Regression/Makefile.am @@ -17,18 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2709_Regression_Client.am - -if BUILD_ACE_UUID -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if !BUILD_ACE_FOR_TAO +## Makefile.Bug_2709_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -36,7 +28,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -48,9 +40,21 @@ CLEANFILES += \ TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2709_Regression_Client.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -70,11 +74,7 @@ client_SOURCES = \ client.cpp \ Client_Task.h \ Server_Task.h \ - TestC.h \ - TestC.inl \ - TestImpl.h \ - TestS.h \ - TestS.inl + TestImpl.h client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ @@ -102,29 +102,6 @@ endif BUILD_ACE_UUID if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -140,11 +117,7 @@ server_SOURCES = \ TestS.cpp \ server.cpp \ Server_Task.h \ - TestC.h \ - TestC.inl \ - TestImpl.h \ - TestS.h \ - TestS.inl + TestImpl.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc index 9d58d8df81e..bbebd287918 100644 --- a/TAO/tests/Hang_Shutdown/Hang.mpc +++ b/TAO/tests/Hang_Shutdown/Hang.mpc @@ -1,12 +1,22 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver { + after += *idl Source_Files { server.cpp TestS.cpp TestC.cpp } + IDL_Files { + } } project(*Client): taoclient, anytypecode { @@ -16,5 +26,6 @@ project(*Client): taoclient, anytypecode { TestC.cpp client.cpp } + IDL_Files { + } } - diff --git a/TAO/tests/Hang_Shutdown/Makefile.am b/TAO/tests/Hang_Shutdown/Makefile.am index a91e1261bd6..8130b9abea1 100644 --- a/TAO/tests/Hang_Shutdown/Makefile.am +++ b/TAO/tests/Hang_Shutdown/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Hang_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Hang_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -44,9 +40,17 @@ CLEANFILES += \ TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Hang_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -59,10 +63,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + test_i.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -77,27 +78,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -109,10 +89,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc index 5e248a71c1e..d5f14d2a0c1 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.mpc +++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc @@ -1,11 +1,23 @@ // -*- MPC -*- // $Id$ +project(ICMG_Any_Bug_Hello_IDL): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(ICMG_Any_Bug_Hello_Server): taoserver { + after += ICMG_Any_Bug_Hello_IDL Source_Files { Hello.cpp HelloWorld.cpp server.cpp + TestS.cpp + TestC.cpp + } + IDL_Files { } } @@ -15,5 +27,6 @@ project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, avo TestC.cpp client.cpp } + IDL_Files { + } } - diff --git a/TAO/tests/ICMG_Any_Bug/Makefile.am b/TAO/tests/ICMG_Any_Bug/Makefile.am index 76e3e48d7a3..4e48dda5ab5 100644 --- a/TAO/tests/ICMG_Any_Bug/Makefile.am +++ b/TAO/tests/ICMG_Any_Bug/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.ICMG_Any_Bug_Hello_Server.am - -if BUILD_EXCEPTIONS +## Makefile.ICMG_Any_Bug_Hello_IDL.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -44,9 +40,17 @@ CLEANFILES += \ TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.ICMG_Any_Bug_Hello_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -62,11 +66,7 @@ server_SOURCES = \ TestS.cpp \ server.cpp \ Hello.h \ - HelloWorld.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + HelloWorld.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -81,27 +81,6 @@ endif BUILD_EXCEPTIONS if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -113,10 +92,8 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h \ + HelloWorld.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ diff --git a/TAO/tests/OctetSeq/Makefile.am b/TAO/tests/OctetSeq/Makefile.am index ff9a5c7434c..9fda7f1b047 100644 --- a/TAO/tests/OctetSeq/Makefile.am +++ b/TAO/tests/OctetSeq/Makefile.am @@ -17,15 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.OctetSeq_Server.am - -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO +## Makefile.OctetSeq_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ testC.cpp \ testC.h \ testC.inl \ @@ -33,7 +28,7 @@ BUILT_SOURCES += \ testS.h \ testS.inl -CLEANFILES += \ +CLEANFILES = \ test-stamp \ testC.cpp \ testC.h \ @@ -45,9 +40,18 @@ CLEANFILES += \ testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.OctetSeq_Server.am + +if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -61,10 +65,6 @@ server_SOURCES = \ testC.cpp \ testS.cpp \ test_i.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ test_i.h \ test_i.inl @@ -82,27 +82,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -114,10 +93,8 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + test_i.h \ + test_i.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -131,27 +108,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - noinst_PROGRAMS += OctetSeq OctetSeq_CPPFLAGS = \ @@ -163,10 +119,8 @@ OctetSeq_CPPFLAGS = \ OctetSeq_SOURCES = \ OctetSeq.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + test_i.h \ + test_i.inl OctetSeq_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc index 4a526ffae60..1efbe0f2129 100644 --- a/TAO/tests/OctetSeq/OctetSeq.mpc +++ b/TAO/tests/OctetSeq/OctetSeq.mpc @@ -1,11 +1,23 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): taoserver { avoids += ace_for_tao + after += *idl Source_Files { test_i.cpp server.cpp + testS.cpp + testC.cpp + } + IDL_Files { } } @@ -16,6 +28,8 @@ project(*Client): taoclient, anytypecode { testC.cpp client.cpp } + IDL_Files { + } } project(*OctetSeq): taoclient, anytypecode { @@ -25,5 +39,6 @@ project(*OctetSeq): taoclient, anytypecode { testC.cpp OctetSeq.cpp } + IDL_Files { + } } - diff --git a/TAO/tests/Param_Test/Makefile.am b/TAO/tests/Param_Test/Makefile.am index 01e06d2e730..37e063142b3 100644 --- a/TAO/tests/Param_Test/Makefile.am +++ b/TAO/tests/Param_Test/Makefile.am @@ -17,36 +17,11 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = ## Makefile.Param_Test_Server.am if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.cpp \ - param_testS.h \ - param_testS.inl - -CLEANFILES += \ - param_test-stamp \ - param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.cpp \ - param_testS.h \ - param_testS.inl - -param_testC.cpp param_testC.h param_testC.inl param_testS.cpp param_testS.h param_testS.inl: param_test-stamp - -param_test-stamp: $(srcdir)/param_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/param_test.idl - @touch $@ - noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,10 +35,6 @@ server_SOURCES = \ param_testS.cpp \ param_test_i.cpp \ server.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.h \ - param_testS.inl \ param_test_i.h server_LDADD = \ @@ -80,29 +51,6 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -BUILT_SOURCES += \ - param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.cpp \ - param_testS.h \ - param_testS.inl - -CLEANFILES += \ - param_test-stamp \ - param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.cpp \ - param_testS.h \ - param_testS.inl - -param_testC.cpp param_testC.h param_testC.inl param_testS.cpp param_testS.h param_testS.inl: param_test-stamp - -param_test-stamp: $(srcdir)/param_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/param_test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -135,7 +83,6 @@ client_SOURCES = \ objref_struct.cpp \ options.cpp \ param_testC.cpp \ - param_testS.cpp \ recursive_struct.cpp \ recursive_union.cpp \ results.cpp \ @@ -177,10 +124,6 @@ client_SOURCES = \ objref.h \ objref_struct.h \ options.h \ - param_testC.h \ - param_testC.inl \ - param_testS.h \ - param_testS.inl \ recursive_struct.h \ recursive_union.h \ results.h \ @@ -220,27 +163,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.h \ - param_testS.inl - -CLEANFILES += \ - param_test-stamp \ - param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.h \ - param_testS.inl - -param_testC.cpp param_testC.h param_testC.inl param_testS.h param_testS.inl: param_test-stamp - -param_test-stamp: $(srcdir)/param_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/param_test.idl - @touch $@ - noinst_PROGRAMS += anyop anyop_CPPFLAGS = \ @@ -252,10 +174,49 @@ anyop_CPPFLAGS = \ anyop_SOURCES = \ anyop.cpp \ param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.h \ - param_testS.inl + any.h \ + bd_array_seq.h \ + bd_long_seq.h \ + bd_short_seq.h \ + bd_str_seq.h \ + bd_string.h \ + bd_struct_seq.h \ + bd_wstr_seq.h \ + bd_wstring.h \ + big_union.h \ + client.h \ + complex_any.h \ + driver.h \ + except.h \ + fixed_array.h \ + fixed_struct.h \ + helper.h \ + multdim_array.h \ + nested_struct.h \ + objref.h \ + objref_struct.h \ + options.h \ + param_test_i.h \ + recursive_struct.h \ + recursive_union.h \ + results.h \ + short.h \ + small_union.h \ + tests.h \ + typecode.h \ + ub_any_seq.h \ + ub_array_seq.h \ + ub_long_seq.h \ + ub_objref_seq.h \ + ub_short_seq.h \ + ub_str_seq.h \ + ub_string.h \ + ub_struct_seq.h \ + ub_wstr_seq.h \ + ub_wstring.h \ + ulonglong.h \ + var_array.h \ + var_struct.h anyop_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -265,6 +226,35 @@ anyop_LDADD = \ endif BUILD_EXCEPTIONS +## Makefile.Param_Test_Idl.am + +BUILT_SOURCES = \ + param_testC.cpp \ + param_testC.h \ + param_testC.inl \ + param_testS.cpp \ + param_testS.h \ + param_testS.inl + +CLEANFILES = \ + param_test-stamp \ + param_testC.cpp \ + param_testC.h \ + param_testC.inl \ + param_testS.cpp \ + param_testS.h \ + param_testS.inl + +param_testC.cpp param_testC.h param_testC.inl param_testS.cpp param_testS.h param_testS.inl: param_test-stamp + +param_test-stamp: $(srcdir)/param_test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/param_test.idl + @touch $@ + + +noinst_HEADERS = \ + param_test.idl + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index 0fb8c44810f..6ed70f48671 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -1,11 +1,22 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + param_test.idl + } + custom_only = 1 +} + project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact { Source_Files { param_test_i.cpp + param_testS.cpp + param_testC.cpp server.cpp } + IDL_Files { + } } project(*Client): taoserver, avoids_minimum_corba, dynamicinterface { @@ -14,6 +25,7 @@ project(*Client): taoserver, avoids_minimum_corba, dynamicinterface { after += *Server Source_Files { + param_testC.cpp any.cpp bd_array_seq.cpp bd_long_seq.cpp @@ -56,6 +68,8 @@ project(*Client): taoserver, avoids_minimum_corba, dynamicinterface { var_array.cpp var_struct.cpp } + IDL_Files { + } } project(*Anyop): taoserver, avoids_minimum_corba, avoids_corba_e_compact { @@ -66,5 +80,7 @@ project(*Anyop): taoserver, avoids_minimum_corba, avoids_corba_e_compact { param_testC.cpp anyop.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am index 26893cc4bae..ff23c5510c2 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am @@ -17,15 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.PI_ORB_Shutdown_Server.am +## Makefile.PI_ORB_Shutdown_Idl.am -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -BUILT_SOURCES += \ +BUILT_SOURCES = \ testC.cpp \ testC.h \ testC.inl \ @@ -33,7 +28,7 @@ BUILT_SOURCES += \ testS.h \ testS.inl -CLEANFILES += \ +CLEANFILES = \ test-stamp \ testC.cpp \ testC.h \ @@ -45,9 +40,18 @@ CLEANFILES += \ testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.PI_ORB_Shutdown_Server.am + +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -65,10 +69,6 @@ server_SOURCES = \ test_i.cpp \ Server_ORBInitializer.h \ Server_Request_Interceptor.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ test_i.h server_LDADD = \ @@ -87,27 +87,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -119,10 +98,9 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + Server_ORBInitializer.h \ + Server_Request_Interceptor.h \ + test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc index 600ba5c118b..9d771aa9f04 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc @@ -2,13 +2,25 @@ // // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only =1 +} + project(*Server): taoserver, pi_server, interceptors { + after += *idl Source_Files { test_i.cpp + testS.cpp + testC.cpp Server_ORBInitializer.cpp Server_Request_Interceptor.cpp server.cpp } + IDL_Files { + } } project(*Client): taoclient, anytypecode { @@ -18,5 +30,6 @@ project(*Client): taoclient, anytypecode { testC.cpp client.cpp } + IDL_Files { + } } - diff --git a/TAO/tests/RTCORBA/Client_Propagated/Makefile.am b/TAO/tests/RTCORBA/Client_Propagated/Makefile.am index fbf76664535..0692cc39c09 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Makefile.am +++ b/TAO/tests/RTCORBA/Client_Propagated/Makefile.am @@ -17,15 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.RTCORBA_Client_Propagated_Server.am +## Makefile.RTCORBA_Client_Propagated_Idl.am -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -BUILT_SOURCES += \ +BUILT_SOURCES = \ testC.cpp \ testC.h \ testC.inl \ @@ -33,7 +28,7 @@ BUILT_SOURCES += \ testS.h \ testS.inl -CLEANFILES += \ +CLEANFILES = \ test-stamp \ testC.cpp \ testC.h \ @@ -45,9 +40,18 @@ CLEANFILES += \ testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.RTCORBA_Client_Propagated_Server.am + +if BUILD_EXCEPTIONS +if BUILD_RT_CORBA + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,10 +64,8 @@ server_SOURCES = \ server.cpp \ testC.cpp \ testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + Client_ORBInitializer.h \ + interceptors.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ @@ -84,27 +86,6 @@ if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_RT_CORBA -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -119,11 +100,7 @@ client_SOURCES = \ interceptors.cpp \ testC.cpp \ Client_ORBInitializer.h \ - interceptors.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + interceptors.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc index 9f0ce92c6ea..083f7252710 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc +++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc @@ -1,9 +1,21 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): rt_server { + after += *idl Source_Files { server.cpp + testS.cpp + testC.cpp + } + IDL_Files { } } @@ -15,5 +27,6 @@ project(*Client): rt_client, interceptors { Client_ORBInitializer.cpp client.cpp } + IDL_Files { + } } - diff --git a/TAO/tests/Timeout/Makefile.am b/TAO/tests/Timeout/Makefile.am index 53fe518da98..a891fa15750 100644 --- a/TAO/tests/Timeout/Makefile.am +++ b/TAO/tests/Timeout/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Timeout_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Timeout_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ testC.cpp \ testC.h \ testC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ testS.h \ testS.inl -CLEANFILES += \ +CLEANFILES = \ test-stamp \ testC.cpp \ testC.h \ @@ -44,9 +40,17 @@ CLEANFILES += \ testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Timeout_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,10 +64,6 @@ server_SOURCES = \ testC.cpp \ testS.cpp \ test_i.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ test_i.h server_LDADD = \ @@ -79,27 +79,6 @@ endif BUILD_EXCEPTIONS if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -111,10 +90,7 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc index 5826c607d6e..e42705f179e 100644 --- a/TAO/tests/Timeout/Timeout.mpc +++ b/TAO/tests/Timeout/Timeout.mpc @@ -1,11 +1,23 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): taoserver { + after += *idl Source_Files { test_i.cpp + testS.cpp + testC.cpp server.cpp } + IDL_Files { + } } project(*Client): taoclient, messaging { @@ -14,5 +26,6 @@ project(*Client): taoclient, messaging { testC.cpp client.cpp } + IDL_Files { + } } - |