diff options
| -rw-r--r-- | TAO/ChangeLog | 18 | ||||
| -rw-r--r-- | TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc | 16 | ||||
| -rw-r--r-- | TAO/tests/AMH_Exceptions/Makefile.am | 55 | ||||
| -rw-r--r-- | TAO/tests/AMH_Oneway/AMH_Oneway.mpc | 16 | ||||
| -rw-r--r-- | TAO/tests/AMH_Oneway/Makefile.am | 55 | ||||
| -rw-r--r-- | TAO/tests/AMI/AMI.mpc | 20 | ||||
| -rw-r--r-- | TAO/tests/AMI/Makefile.am | 82 | ||||
| -rw-r--r-- | TAO/tests/AMI_Buffering/AMI_Buffering.mpc | 20 | ||||
| -rw-r--r-- | TAO/tests/AMI_Buffering/Makefile.am | 86 | ||||
| -rw-r--r-- | TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc | 18 | ||||
| -rw-r--r-- | TAO/tests/AMI_Timeouts/Makefile.am | 75 |
11 files changed, 208 insertions, 253 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ef5ea414ec6..09232ecc6fe 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,21 @@ +Tue Dec 5 04:10:47 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * tests/AMH_Exceptions/Makefile.am: + * tests/AMH_Oneway/Makefile.am: + * tests/AMI/Makefile.am: + * tests/AMI_Buffering/Makefile.am: + * tests/AMI_Timeouts/Makefile.am: + + Regenerated. + + * tests/AMH_Exceptions/AMH_Exceptions.mpc: + * tests/AMH_Oneway/AMH_Oneway.mpc: + * tests/AMI/AMI.mpc: + * tests/AMI_Buffering/AMI_Buffering.mpc: + * tests/AMI_Timeouts/AMI_Timeouts.mpc: + + Split out IDL compilation into separate MPC project. + Mon Dec 4 18:01:55 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> * tests/ORB_Local_Config/Bug_2612: diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc index 5188e4a669b..40ae9a4d2a7 100644 --- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc +++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc @@ -1,9 +1,21 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, amh { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, amh, strategies { + after += *idl Source_Files { server.cpp + TestS.cpp + TestC.cpp + } + IDL_Files { } } @@ -11,5 +23,9 @@ project(*Client): taoexe, amh, portableserver, strategies { after += *Server Source_Files { client.cpp + TestS.cpp + TestC.cpp + } + IDL_Files { } } diff --git a/TAO/tests/AMH_Exceptions/Makefile.am b/TAO/tests/AMH_Exceptions/Makefile.am index 752d1502ae9..98fcf5a39a8 100644 --- a/TAO/tests/AMH_Exceptions/Makefile.am +++ b/TAO/tests/AMH_Exceptions/Makefile.am @@ -17,15 +17,13 @@ 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.AMH_Exceptions_Server.am +## Makefile.AMH_Exceptions_Idl.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -33,7 +31,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -48,6 +46,18 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.AMH_Exceptions_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -59,11 +69,7 @@ server_CPPFLAGS = \ server_SOURCES = \ TestC.cpp \ TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + server.cpp server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ @@ -84,29 +90,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING 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) -GH $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -118,11 +101,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ TestS.cpp \ - client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + client.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc index a0a1fbb883e..fb289ca96cb 100644 --- a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc +++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc @@ -1,9 +1,21 @@ // -*- MPC -*- // $Id$ +project(*idl) : taoidldefaults, amh { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*client) : taoexe, portableserver, amh { + after += *idl source_files { client.cpp + TestS.cpp + TestC.cpp + } + IDL_Files { } } @@ -11,5 +23,9 @@ project(*server) : taoserver, amh, strategies { after += *client source_files { server.cpp + TestS.cpp + TestC.cpp + } + IDL_Files { } } diff --git a/TAO/tests/AMH_Oneway/Makefile.am b/TAO/tests/AMH_Oneway/Makefile.am index 0e6aa397535..d5b6cc1c729 100644 --- a/TAO/tests/AMH_Oneway/Makefile.am +++ b/TAO/tests/AMH_Oneway/Makefile.am @@ -17,15 +17,13 @@ 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.AMH_Oneway_Client.am +## Makefile.AMH_Oneway_Idl.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -33,7 +31,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -48,6 +46,18 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.AMH_Oneway_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -59,11 +69,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ TestS.cpp \ - client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + client.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -83,29 +89,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING 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) -GH $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -117,11 +100,7 @@ server_CPPFLAGS = \ server_SOURCES = \ TestC.cpp \ TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + server.cpp server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc index 894442827ba..69265f72525 100644 --- a/TAO/tests/AMI/AMI.mpc +++ b/TAO/tests/AMI/AMI.mpc @@ -1,17 +1,33 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, ami { + IDL_Files { + ami_test.idl + } + custom_only = 1 +} + project(*Server): taoserver, messaging, ami { + after += *idl Source_Files { ami_test_i.cpp + ami_testS.cpp + ami_testC.cpp server.cpp } + IDL_Files { + } } project(*Client): messaging, taoexe, portableserver, ami { after += *Server Source_Files { client.cpp + ami_testS.cpp + ami_testC.cpp + } + IDL_Files { } } @@ -19,5 +35,9 @@ project(*Simple Client): messaging, taoexe, portableserver, ami { after += *Server Source_Files { simple_client.cpp + ami_testS.cpp + ami_testC.cpp + } + IDL_Files { } } diff --git a/TAO/tests/AMI/Makefile.am b/TAO/tests/AMI/Makefile.am index 4458b3a3d65..6080f80c787 100644 --- a/TAO/tests/AMI/Makefile.am +++ b/TAO/tests/AMI/Makefile.am @@ -17,16 +17,14 @@ 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.AMI_Server.am +## Makefile.AMI_Idl.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ ami_testC.cpp \ ami_testC.h \ ami_testC.inl \ @@ -34,7 +32,7 @@ BUILT_SOURCES += \ ami_testS.h \ ami_testS.inl -CLEANFILES += \ +CLEANFILES = \ ami_test-stamp \ ami_testC.cpp \ ami_testC.h \ @@ -49,6 +47,20 @@ ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl @touch $@ + +noinst_HEADERS = \ + ami_test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Makefile.AMI_Server.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -62,10 +74,6 @@ server_SOURCES = \ ami_testS.cpp \ ami_test_i.cpp \ server.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.h \ - ami_testS.inl \ ami_test_i.h server_LDADD = \ @@ -88,29 +96,6 @@ if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES += \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -123,10 +108,7 @@ client_SOURCES = \ ami_testC.cpp \ ami_testS.cpp \ client.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.h \ - ami_testS.inl + ami_test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -148,29 +130,6 @@ if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES += \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - noinst_PROGRAMS += simple_client simple_client_CPPFLAGS = \ @@ -183,10 +142,7 @@ simple_client_SOURCES = \ ami_testC.cpp \ ami_testS.cpp \ simple_client.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.h \ - ami_testS.inl + ami_test_i.h simple_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc index a4156b9a83f..5fb820f88c7 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc @@ -1,10 +1,22 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, ami { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, ami { + after += *idl Source_Files { AMI_Buffering.cpp server.cpp + TestS.cpp + TestC.cpp + } + IDL_Files { } } @@ -15,6 +27,10 @@ project(*Client): taoserver, ami { Client_Task.cpp Reply_Handler.cpp client.cpp + TestS.cpp + TestC.cpp + } + IDL_Files { } } @@ -24,5 +40,9 @@ project(*Admin): taoserver, ami { Source_Files { AMI_Buffering_Admin.cpp admin.cpp + TestS.cpp + TestC.cpp + } + IDL_Files { } } diff --git a/TAO/tests/AMI_Buffering/Makefile.am b/TAO/tests/AMI_Buffering/Makefile.am index 31f7ee69e54..68d320afe30 100644 --- a/TAO/tests/AMI_Buffering/Makefile.am +++ b/TAO/tests/AMI_Buffering/Makefile.am @@ -17,16 +17,14 @@ 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.AMI_Buffering_Server.am +## Makefile.AMI_Buffering_Idl.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -34,7 +32,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -49,6 +47,20 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Makefile.AMI_Buffering_Server.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -62,11 +74,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - AMI_Buffering.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + AMI_Buffering.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -88,29 +96,6 @@ if BUILD_AMI if BUILD_CORBA_MESSAGING 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) -GC $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -126,11 +111,7 @@ client_SOURCES = \ TestS.cpp \ client.cpp \ Client_Task.h \ - Reply_Handler.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Reply_Handler.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -152,29 +133,6 @@ if BUILD_AMI if BUILD_CORBA_MESSAGING 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) -GC $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += admin admin_CPPFLAGS = \ @@ -188,11 +146,7 @@ admin_SOURCES = \ TestC.cpp \ TestS.cpp \ admin.cpp \ - AMI_Buffering_Admin.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + AMI_Buffering_Admin.h admin_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc index bf72e8baca6..ae39f7b15c7 100644 --- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc +++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc @@ -1,20 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, ami { + IDL_Files { + timeout.idl + } + custom_only = 1 +} + project(*Server): taoserver, ami { + after += *idl Source_Files { timeout_i.cpp timeout_client.cpp server.cpp + timeoutS.cpp + timeoutC.cpp + } + IDL_Files { } } project(*Client): taoserver, ami { + after += *Server exename = client Source_Files { timeout_i.cpp timeout_client.cpp client.cpp + timeoutS.cpp + timeoutC.cpp + } + IDL_Files { } } - diff --git a/TAO/tests/AMI_Timeouts/Makefile.am b/TAO/tests/AMI_Timeouts/Makefile.am index e5ccf3b8258..835abf19eb3 100644 --- a/TAO/tests/AMI_Timeouts/Makefile.am +++ b/TAO/tests/AMI_Timeouts/Makefile.am @@ -17,16 +17,14 @@ 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.AMI_Timeouts_Client.am +## Makefile.AMI_Timeouts_Idl.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ timeoutC.cpp \ timeoutC.h \ timeoutC.inl \ @@ -34,7 +32,7 @@ BUILT_SOURCES += \ timeoutS.h \ timeoutS.inl -CLEANFILES += \ +CLEANFILES = \ timeout-stamp \ timeoutC.cpp \ timeoutC.h \ @@ -49,28 +47,38 @@ timeout-stamp: $(srcdir)/timeout.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/timeout.idl @touch $@ -noinst_PROGRAMS += client -client_CPPFLAGS = \ +noinst_HEADERS = \ + timeout.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Makefile.AMI_Timeouts_Server.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ timeoutC.cpp \ timeoutS.cpp \ timeout_client.cpp \ timeout_i.cpp \ - timeoutC.h \ - timeoutC.inl \ - timeoutS.h \ - timeoutS.inl \ timeout_client.h \ timeout_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -84,57 +92,30 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.AMI_Timeouts_Server.am +## Makefile.AMI_Timeouts_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - timeoutC.cpp \ - timeoutC.h \ - timeoutC.inl \ - timeoutS.cpp \ - timeoutS.h \ - timeoutS.inl - -CLEANFILES += \ - timeout-stamp \ - timeoutC.cpp \ - timeoutC.h \ - timeoutC.inl \ - timeoutS.cpp \ - timeoutS.h \ - timeoutS.inl - -timeoutC.cpp timeoutC.h timeoutC.inl timeoutS.cpp timeoutS.h timeoutS.inl: timeout-stamp - -timeout-stamp: $(srcdir)/timeout.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/timeout.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 = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ timeoutC.cpp \ timeoutS.cpp \ timeout_client.cpp \ timeout_i.cpp \ - timeoutC.h \ - timeoutC.inl \ - timeoutS.h \ - timeoutS.inl \ timeout_client.h \ timeout_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ |