diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-10 20:50:06 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-10 20:50:06 +0000 |
| commit | fdc53a042e17e5e1dfc780ca02283da5fcb8fb29 (patch) | |
| tree | 0cae2eb766a50faa8f7680a73497a774c0d219c5 | |
| parent | 2acb66d7cefa03eae71ce3068124f671208b2d8d (diff) | |
| download | ATCD-fdc53a042e17e5e1dfc780ca02283da5fcb8fb29.tar.gz | |
ChangeLogTag: Sun Dec 10 20:43:26 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
39 files changed, 687 insertions, 808 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 30bee136fc1..290220485ca 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,55 @@ +Sun Dec 10 20:43:26 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * tests/Bug_2503_Regression/Makefile.am: + * tests/Bug_2560_Regression/Makefile.am: + * tests/Bug_2593_Regression/Makefile.am: + * tests/Bug_2595_Regression/Makefile.am: + * tests/Bug_2683_Regression/Makefile.am: + * tests/Cache_Growth_Test/Makefile.am: + * tests/CallbackTest/Makefile.am: + * tests/Client_Leaks/Makefile.am: + * tests/CodeSets/simple/Makefile.am: + * tests/Connect_Strategy_Test/Makefile.am: + * tests/Connection_Purging/Makefile.am: + * tests/Crash_On_Write/Makefile.am: + * tests/Crashed_Callback/Makefile.am: + * tests/Strategies/Makefile.am: + * tests/Timed_Buffered_Oneways/Makefile.am: + * tests/Two_Objects/Makefile.am: + * tests/Typedef_String_Array/Makefile.am: + * tests/UNKNOWN_Exception/Makefile.am: + + Regenerated. + + * tests/Bug_2503_Regression/Bug_2503_Regression.mpc: + * tests/Bug_2560_Regression/Bug_2560_Regression.mpc: + * tests/Bug_2593_Regression/Bug_2593_Regression.mpc: + * tests/Bug_2595_Regression/Bug_2595_Regression.mpc: + * tests/Bug_2683_Regression/IORTable.mpc: + * tests/Cache_Growth_Test/Cache_Growth_Test.mpc: + * tests/CallbackTest/CallbackTest.mpc: + * tests/Client_Leaks/Client_Leaks.mpc: + * tests/CodeSets/simple/CodeSets_simple.mpc: + * tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc: + * tests/Connection_Purging/Connection_Purging.mpc: + * tests/Crash_On_Write/Crash_On_Write.mpc: + * tests/Crashed_Callback/Crashed_Callback.mpc: + * tests/Strategies/Strategies.mpc: + * tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc: + * tests/Two_Objects/Two_Objects.mpc: + * tests/Typedef_String_Array/typedef_string_array.mpc: + * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc: + + Split out IDL compilation into separate MPC project. + + * tests/Bug_2186_Regression/Makefile.am: + + Regenerated. + + * tests/Bug_2186_Regression/Bug_2186_Regression.mpc: + + Add empty IDL_Files sections to Client and Server projects. + Sun Dec 10 01:36:17 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * tests/Bug_2234_Regression/Makefile.am: diff --git a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc index 8bbb6c81cd3..874a0bb77df 100644 --- a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc +++ b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc @@ -12,9 +12,13 @@ project(*Server): taoserver, strategies { after += *idl Source_Files { Hello.cpp + server.cpp + } + Source_Files { TestC.cpp TestS.cpp - server.cpp + } + IDL_Files { } } @@ -24,9 +28,13 @@ project(*Client): taoserver, strategies { exename = client Source_Files { Hello.cpp + client.cpp + } + Source_Files { TestC.cpp TestS.cpp - client.cpp + } + IDL_Files { } } diff --git a/TAO/tests/Bug_2186_Regression/Makefile.am b/TAO/tests/Bug_2186_Regression/Makefile.am index 0d6be7f42ef..a2413d1df7d 100644 --- a/TAO/tests/Bug_2186_Regression/Makefile.am +++ b/TAO/tests/Bug_2186_Regression/Makefile.am @@ -51,29 +51,6 @@ noinst_HEADERS = \ 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 = \ @@ -87,11 +64,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ @@ -106,29 +79,6 @@ endif BUILD_EXCEPTIONS 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 += client client_CPPFLAGS = \ @@ -142,11 +92,7 @@ client_SOURCES = \ TestC.cpp \ TestS.cpp \ client.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc index 583b69ba543..538d116a20e 100644 --- a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc +++ b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc @@ -1,20 +1,41 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, ami { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): messaging, taoserver, ami { + after += *idl Source_Files { test_i.cpp common.cpp server.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } project(*Client): messaging, taoexe, portableserver, ami { + after += *idl after += *Server Source_Files { test_i.cpp common.cpp client.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2503_Regression/Makefile.am b/TAO/tests/Bug_2503_Regression/Makefile.am index ee68b19d886..2e2993ff7b6 100644 --- a/TAO/tests/Bug_2503_Regression/Makefile.am +++ b/TAO/tests/Bug_2503_Regression/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.Bug_2503_Regression_Server.am +## Makefile.Bug_2503_Regression_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.Bug_2503_Regression_Server.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -63,10 +75,6 @@ server_SOURCES = \ common.cpp \ server.cpp \ test_i.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ common.h \ test_i.h @@ -90,29 +98,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 = \ @@ -127,10 +112,6 @@ client_SOURCES = \ client.cpp \ common.cpp \ test_i.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ common.h \ test_i.h diff --git a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc index 401f837e1d6..029187f3e03 100644 --- a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc +++ b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc @@ -1,20 +1,38 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Quoter.idl + } + custom_only = 1 +} + project(*client) : taoclient { + after += *idl after += *Server exename = client source_files { - QuoterC.cpp client.cpp } + source_files { + QuoterC.cpp + } + IDL_Files { + } } project(*server) : taoserver { - idlflags += -Sa -St + after += *idl source_files { server.cpp Stock_Factory_i.cpp Stock_i.cpp } + source_files { + QuoterC.cpp + QuoterS.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2560_Regression/Makefile.am b/TAO/tests/Bug_2560_Regression/Makefile.am index 3c1ab4f4e8a..407e10ef7c4 100644 --- a/TAO/tests/Bug_2560_Regression/Makefile.am +++ b/TAO/tests/Bug_2560_Regression/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.Bug_2560_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2560_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ QuoterC.cpp \ QuoterC.h \ QuoterC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ QuoterS.h \ QuoterS.inl -CLEANFILES += \ +CLEANFILES = \ Quoter-stamp \ QuoterC.cpp \ QuoterC.h \ @@ -47,6 +43,14 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Quoter.idl @touch $@ + +noinst_HEADERS = \ + Quoter.idl + +## Makefile.Bug_2560_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -61,10 +65,6 @@ server_SOURCES = \ Stock_Factory_i.cpp \ Stock_i.cpp \ server.cpp \ - QuoterC.h \ - QuoterC.inl \ - QuoterS.h \ - QuoterS.inl \ Stock_Factory_i.h \ Stock_i.h @@ -80,27 +80,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - QuoterC.cpp \ - QuoterC.h \ - QuoterC.inl \ - QuoterS.h \ - QuoterS.inl - -CLEANFILES += \ - Quoter-stamp \ - QuoterC.cpp \ - QuoterC.h \ - QuoterC.inl \ - QuoterS.h \ - QuoterS.inl - -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.h QuoterS.inl: Quoter-stamp - -Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Quoter.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -112,10 +91,8 @@ client_CPPFLAGS = \ client_SOURCES = \ QuoterC.cpp \ client.cpp \ - QuoterC.h \ - QuoterC.inl \ - QuoterS.h \ - QuoterS.inl + Stock_Factory_i.h \ + Stock_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc index cd7cfb7f305..209f14c1f17 100644 --- a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc +++ b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc @@ -1,19 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, strategies { - idlflags += -Sa -St + after += *idl Source_Files { Hello.cpp server.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } project(*Client): taoclient { + after += *idl after += *Server Source_Files { - TestC.cpp client.cpp } + Source_Files { + TestC.cpp + } + IDL_Files { + } } - diff --git a/TAO/tests/Bug_2593_Regression/Makefile.am b/TAO/tests/Bug_2593_Regression/Makefile.am index c0854463443..dd9b9a1c61e 100644 --- a/TAO/tests/Bug_2593_Regression/Makefile.am +++ b/TAO/tests/Bug_2593_Regression/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.Bug_2593_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2593_Regression_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 \ @@ -47,6 +43,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2593_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +64,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ @@ -79,27 +79,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) -Sa -St $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -111,10 +90,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc index 9a1892855d9..02e2ddc1120 100644 --- a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc +++ b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc @@ -1,19 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver { - idlflags += -Sa -St + after += *idl Source_Files { Hello.cpp server.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } project(*Client): taoclient { + after += *idl after += *Server Source_Files { - TestC.cpp client.cpp } + Source_Files { + TestC.cpp + } + IDL_Files { + } } - diff --git a/TAO/tests/Bug_2595_Regression/Makefile.am b/TAO/tests/Bug_2595_Regression/Makefile.am index dd0077a387d..72a92ac6c6d 100644 --- a/TAO/tests/Bug_2595_Regression/Makefile.am +++ b/TAO/tests/Bug_2595_Regression/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.Bug_2595_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2595_Regression_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 \ @@ -47,6 +43,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2595_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +64,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -78,27 +78,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) -Sa -St $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -110,10 +89,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2683_Regression/IORTable.mpc b/TAO/tests/Bug_2683_Regression/IORTable.mpc index 669363e1eac..621b224312e 100644 --- a/TAO/tests/Bug_2683_Regression/IORTable.mpc +++ b/TAO/tests/Bug_2683_Regression/IORTable.mpc @@ -1,18 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, iortable { - idlflags += -Sa -St + after += *idl Source_Files { test_i.cpp server.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } project(*Client): taoclient { + after += *idl after += *Server Source_Files { - TestC.cpp client.cpp } + Source_Files { + TestC.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2683_Regression/Makefile.am b/TAO/tests/Bug_2683_Regression/Makefile.am index 1a8e6476783..9741adabbd7 100644 --- a/TAO/tests/Bug_2683_Regression/Makefile.am +++ b/TAO/tests/Bug_2683_Regression/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.IORTable_Server.am - -if BUILD_EXCEPTIONS +## Makefile.IORTable_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 \ @@ -47,6 +43,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.IORTable_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,10 +64,6 @@ server_SOURCES = \ TestS.cpp \ server.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_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) -Sa -St $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -111,10 +90,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.la \ diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc index e64ad8d08a8..9e3a806413a 100644 --- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc +++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc @@ -1,18 +1,37 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver { + after += *idl Source_Files { Hello.cpp server.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } project(*Client): taoclient, anytypecode { + after += *idl after += *Server Source_Files { - TestC.cpp client.cpp } + Source_Files { + TestC.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Cache_Growth_Test/Makefile.am b/TAO/tests/Cache_Growth_Test/Makefile.am index 37e5cd6c5fa..d7a28116f17 100644 --- a/TAO/tests/Cache_Growth_Test/Makefile.am +++ b/TAO/tests/Cache_Growth_Test/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.Cache_Growth_Test_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Cache_Growth_Test_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.Cache_Growth_Test_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +64,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -78,27 +78,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 = \ @@ -110,10 +89,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/CallbackTest/CallbackTest.mpc b/TAO/tests/CallbackTest/CallbackTest.mpc index 9bf640dd2b3..186510c1f55 100644 --- a/TAO/tests/CallbackTest/CallbackTest.mpc +++ b/TAO/tests/CallbackTest/CallbackTest.mpc @@ -1,18 +1,38 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, messaging { + after += *idl Source_Files { Service.cpp server.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } project(*Client): taoclient, portableserver, messaging { + after += *idl after += *Server Source_Files { Callback.cpp client.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } - diff --git a/TAO/tests/CallbackTest/Makefile.am b/TAO/tests/CallbackTest/Makefile.am index 38b42f4c71d..a87b295f9ea 100644 --- a/TAO/tests/CallbackTest/Makefile.am +++ b/TAO/tests/CallbackTest/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.CallbackTest_Server.am +## Makefile.CallbackTest_Idl.am -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -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.CallbackTest_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -61,11 +65,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Service.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Service.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -85,29 +85,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) $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -121,11 +98,7 @@ client_SOURCES = \ TestC.cpp \ TestS.cpp \ client.cpp \ - Callback.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Callback.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc index a83a41950f3..87611da09ef 100644 --- a/TAO/tests/Client_Leaks/Client_Leaks.mpc +++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc @@ -1,30 +1,55 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver { + after += *idl Source_Files { Process_Factory.cpp Startup_Callback.cpp Server_Task.cpp server.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } project(*Client): taoclient, anytypecode { + after += *idl after += *Server Source_Files { - TestC.cpp Client_Task.cpp client.cpp } + Source_Files { + TestC.cpp + } + IDL_Files { + } } project(*Child): taoserver { exename = child + after += *idl after += *Client Source_Files { Process.cpp child.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } - diff --git a/TAO/tests/Client_Leaks/Makefile.am b/TAO/tests/Client_Leaks/Makefile.am index b268cbe8299..db289894063 100644 --- a/TAO/tests/Client_Leaks/Makefile.am +++ b/TAO/tests/Client_Leaks/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.Client_Leaks_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Client_Leaks_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.Client_Leaks_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -64,11 +68,7 @@ server_SOURCES = \ server.cpp \ Process_Factory.h \ Server_Task.h \ - Startup_Callback.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Startup_Callback.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -82,27 +82,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 = \ @@ -115,11 +94,7 @@ client_SOURCES = \ Client_Task.cpp \ TestC.cpp \ client.cpp \ - Client_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Client_Task.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -132,29 +107,6 @@ endif BUILD_EXCEPTIONS 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 += child child_CPPFLAGS = \ @@ -168,11 +120,7 @@ child_SOURCES = \ TestC.cpp \ TestS.cpp \ child.cpp \ - Process.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Process.h child_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc index a0a9ca666ce..6dac99613f4 100644 --- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc +++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc @@ -1,38 +1,42 @@ // -*- MPC -*- // $Id$ -project(*client) : taoclient, anytypecode { - after += *server +project(*idl): taoidldefaults { IDL_Files { simple.idl } + custom_only = 1 +} + +project(*client) : taoclient, anytypecode { + after += *idl + after += *server Source_Files { client.cpp - simpleC.cpp } - Header_Files { - simpleC.h + Source_Files { + simpleC.cpp } - + IDL_Files { + } } project(*server) : taoserver { - IDL_Files { - simple.idl - } - source_files { + after += *idl + + Source_Files { server.cpp + } + + Source_Files { simpleC.cpp simpleS.cpp } - Header_Files { - simpleC.h - simpleS.h + IDL_Files { } - } diff --git a/TAO/tests/CodeSets/simple/Makefile.am b/TAO/tests/CodeSets/simple/Makefile.am index e33e4b2a05d..d2265b2553c 100644 --- a/TAO/tests/CodeSets/simple/Makefile.am +++ b/TAO/tests/CodeSets/simple/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.CodeSets_Simple_Server.am - -if BUILD_EXCEPTIONS +## Makefile.CodeSets_Simple_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ simpleC.cpp \ simpleC.h \ simpleC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ simpleS.h \ simpleS.inl -CLEANFILES += \ +CLEANFILES = \ simple-stamp \ simpleC.cpp \ simpleC.h \ @@ -44,9 +40,17 @@ CLEANFILES += \ simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/simple.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl @touch $@ + +noinst_HEADERS = \ + simple.idl + +## Makefile.CodeSets_Simple_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -58,11 +62,7 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp \ simpleC.cpp \ - simpleS.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.h \ - simpleS.inl + simpleS.cpp server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -76,25 +76,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.inl - -CLEANFILES += \ - simple-stamp \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.inl - -simpleC.cpp simpleC.h simpleC.inl simpleS.inl: simple-stamp - -simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/simple.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -105,10 +86,7 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.inl + simpleC.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc index e64ad8d08a8..9e3a806413a 100644 --- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc +++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc @@ -1,18 +1,37 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver { + after += *idl Source_Files { Hello.cpp server.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } project(*Client): taoclient, anytypecode { + after += *idl after += *Server Source_Files { - TestC.cpp client.cpp } + Source_Files { + TestC.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Connect_Strategy_Test/Makefile.am b/TAO/tests/Connect_Strategy_Test/Makefile.am index 2c18a20e1e2..11ee6725b20 100644 --- a/TAO/tests/Connect_Strategy_Test/Makefile.am +++ b/TAO/tests/Connect_Strategy_Test/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.Connect_Strategy_Test_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Connect_Strategy_Test_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.Connect_Strategy_Test_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +64,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -78,27 +78,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 = \ @@ -110,10 +89,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc index 321e97dff47..c0bd6da0fde 100644 --- a/TAO/tests/Connection_Purging/Connection_Purging.mpc +++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc @@ -1,18 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): strategies, taoserver { + after += *idl Source_Files { test_i.cpp server.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } project(*Client): strategies, taoclient { + after += *idl after += *Server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + } + IDL_Files { + } } - diff --git a/TAO/tests/Connection_Purging/Makefile.am b/TAO/tests/Connection_Purging/Makefile.am index ad59629094b..56e4e49a63d 100644 --- a/TAO/tests/Connection_Purging/Makefile.am +++ b/TAO/tests/Connection_Purging/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.Connection_Purging_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Connection_Purging_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.Connection_Purging_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_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_Strategies.la \ diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc index 2398d1eac4c..ce52c6776dc 100644 --- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc +++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc @@ -1,20 +1,37 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver { - idlflags += -Sa -St + after += *idl Source_Files { Oneway_Receiver.cpp Crash_Task.cpp server.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } project(*Client): taoclient { + after += *idl after += *Server Source_Files { - TestC.cpp client.cpp } + Source_Files { + TestC.cpp + } + IDL_Files { + } } - diff --git a/TAO/tests/Crash_On_Write/Makefile.am b/TAO/tests/Crash_On_Write/Makefile.am index 9152b8ff732..f24cb4c3e54 100644 --- a/TAO/tests/Crash_On_Write/Makefile.am +++ b/TAO/tests/Crash_On_Write/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.Crash_On_Write_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Crash_On_Write_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 \ @@ -47,6 +43,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Crash_On_Write_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -62,11 +66,7 @@ server_SOURCES = \ TestS.cpp \ server.cpp \ Crash_Task.h \ - Oneway_Receiver.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Oneway_Receiver.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -80,27 +80,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) -Sa -St $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -112,10 +91,8 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Crash_Task.h \ + Oneway_Receiver.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc index 34711dbef67..fb46b04e3df 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc @@ -1,18 +1,39 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, messaging { + after += *idl Source_Files { Service.cpp server.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } project(*Client): taoclient, portableserver, messaging { + after += *idl after += *Server Source_Files { Crashed_Callback.cpp client.cpp } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Crashed_Callback/Makefile.am b/TAO/tests/Crashed_Callback/Makefile.am index 8d29317a0a0..06355f05e97 100644 --- a/TAO/tests/Crashed_Callback/Makefile.am +++ b/TAO/tests/Crashed_Callback/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.Crashed_Callback_Server.am +## Makefile.Crashed_Callback_Idl.am -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -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.Crashed_Callback_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -61,11 +65,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Service.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Service.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -85,29 +85,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) $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -121,11 +98,7 @@ client_SOURCES = \ TestC.cpp \ TestS.cpp \ client.cpp \ - Crashed_Callback.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Crashed_Callback.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/tests/Strategies/Makefile.am b/TAO/tests/Strategies/Makefile.am index bbdd58f41a5..91f89c26000 100644 --- a/TAO/tests/Strategies/Makefile.am +++ b/TAO/tests/Strategies/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.Strategies_Server.am +## Makefile.Strategies_Idl.am -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ +BUILT_SOURCES = \ simple_testC.cpp \ simple_testC.h \ simple_testC.inl \ @@ -33,7 +28,7 @@ BUILT_SOURCES += \ simple_testS.h \ simple_testS.inl -CLEANFILES += \ +CLEANFILES = \ simple_test-stamp \ simple_testC.cpp \ simple_testC.h \ @@ -45,9 +40,18 @@ CLEANFILES += \ simple_testC.cpp simple_testC.h simple_testC.inl simple_testS.cpp simple_testS.h simple_testS.inl: simple_test-stamp simple_test-stamp: $(srcdir)/simple_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/simple_test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple_test.idl @touch $@ + +noinst_HEADERS = \ + simple_test.idl + +## Makefile.Strategies_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -61,10 +65,6 @@ server_SOURCES = \ simple_testC.cpp \ simple_testS.cpp \ simple_test_i.cpp \ - simple_testC.h \ - simple_testC.inl \ - simple_testS.h \ - simple_testS.inl \ simple_test_i.h \ simple_test_i.inl @@ -87,27 +87,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - simple_testC.cpp \ - simple_testC.h \ - simple_testC.inl \ - simple_testS.h \ - simple_testS.inl - -CLEANFILES += \ - simple_test-stamp \ - simple_testC.cpp \ - simple_testC.h \ - simple_testC.inl \ - simple_testS.h \ - simple_testS.inl - -simple_testC.cpp simple_testC.h simple_testC.inl simple_testS.h simple_testS.inl: simple_test-stamp - -simple_test-stamp: $(srcdir)/simple_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/simple_test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -119,10 +98,8 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ simple_testC.cpp \ - simple_testC.h \ - simple_testC.inl \ - simple_testS.h \ - simple_testS.inl + simple_test_i.h \ + simple_test_i.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc index 77ac8271640..86d4366c856 100644 --- a/TAO/tests/Strategies/Strategies.mpc +++ b/TAO/tests/Strategies/Strategies.mpc @@ -1,18 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + simple_test.idl + } + custom_only = 1 +} + project(*Server): strategies, messaging, taoserver { + after += *idl Source_Files { simple_test_i.cpp server.cpp } + Source_Files { + simple_testC.cpp + simple_testS.cpp + } + IDL_Files { + } } project(*Client): strategies, messaging, taoexe, portableserver { + after += *idl after += *Server Source_Files { - simple_testC.cpp client.cpp } + Source_Files { + simple_testC.cpp + } + IDL_Files { + } } - diff --git a/TAO/tests/Timed_Buffered_Oneways/Makefile.am b/TAO/tests/Timed_Buffered_Oneways/Makefile.am index 0eb00340daa..8f1caa4fc65 100644 --- a/TAO/tests/Timed_Buffered_Oneways/Makefile.am +++ b/TAO/tests/Timed_Buffered_Oneways/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.Timed_Buffered_Oneways_Server.am +## Makefile.Timed_Buffered_Oneways_Idl.am -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -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.Timed_Buffered_Oneways_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + 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 server_LDADD = \ @@ -85,27 +85,6 @@ endif BUILD_CORBA_MESSAGING 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 = \ @@ -117,10 +96,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/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc index 1bd7978c70a..7dbf0e839ef 100644 --- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc +++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc @@ -1,18 +1,37 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): messaging, taoexe, portableserver { + after += *idl Source_Files { test_i.cpp server.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } project(*Client): messaging, taoexe, portableserver { + after += *idl after += *Server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Two_Objects/Makefile.am b/TAO/tests/Two_Objects/Makefile.am index a715bfaba29..2ab2753f884 100644 --- a/TAO/tests/Two_Objects/Makefile.am +++ b/TAO/tests/Two_Objects/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.Two_Objects_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Two_Objects_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ Two_ObjectsC.cpp \ Two_ObjectsC.h \ Two_ObjectsC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ Two_ObjectsS.h \ Two_ObjectsS.inl -CLEANFILES += \ +CLEANFILES = \ Two_Objects-stamp \ Two_ObjectsC.cpp \ Two_ObjectsC.h \ @@ -44,9 +40,17 @@ CLEANFILES += \ Two_ObjectsC.cpp Two_ObjectsC.h Two_ObjectsC.inl Two_ObjectsS.cpp Two_ObjectsS.h Two_ObjectsS.inl: Two_Objects-stamp Two_Objects-stamp: $(srcdir)/Two_Objects.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Two_Objects.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Two_Objects.idl @touch $@ + +noinst_HEADERS = \ + Two_Objects.idl + +## Makefile.Two_Objects_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -66,10 +70,6 @@ server_SOURCES = \ First_i.h \ Object_Factory_i.h \ Second_i.h \ - Two_ObjectsC.h \ - Two_ObjectsC.inl \ - Two_ObjectsS.h \ - Two_ObjectsS.inl \ worker.h server_LDADD = \ @@ -84,27 +84,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - Two_ObjectsC.cpp \ - Two_ObjectsC.h \ - Two_ObjectsC.inl \ - Two_ObjectsS.h \ - Two_ObjectsS.inl - -CLEANFILES += \ - Two_Objects-stamp \ - Two_ObjectsC.cpp \ - Two_ObjectsC.h \ - Two_ObjectsC.inl \ - Two_ObjectsS.h \ - Two_ObjectsS.inl - -Two_ObjectsC.cpp Two_ObjectsC.h Two_ObjectsC.inl Two_ObjectsS.h Two_ObjectsS.inl: Two_Objects-stamp - -Two_Objects-stamp: $(srcdir)/Two_Objects.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Two_Objects.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -116,10 +95,10 @@ client_CPPFLAGS = \ client_SOURCES = \ Two_ObjectsC.cpp \ client.cpp \ - Two_ObjectsC.h \ - Two_ObjectsC.inl \ - Two_ObjectsS.h \ - Two_ObjectsS.inl + First_i.h \ + Object_Factory_i.h \ + Second_i.h \ + worker.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc index 1dbe304222f..5df5e080f97 100644 --- a/TAO/tests/Two_Objects/Two_Objects.mpc +++ b/TAO/tests/Two_Objects/Two_Objects.mpc @@ -1,7 +1,15 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Two_Objects.idl + } + custom_only = 1 +} + project(*Server): taoserver { + after += *idl Source_Files { worker.cpp First_i.cpp @@ -9,13 +17,24 @@ project(*Server): taoserver { Object_Factory_i.cpp server.cpp } + Source_Files { + Two_ObjectsC.cpp + Two_ObjectsS.cpp + } + IDL_Files { + } } project(*Client): taoclient, anytypecode { + after += *idl after += *Server Source_Files { - Two_ObjectsC.cpp client.cpp } + Source_Files { + Two_ObjectsC.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Typedef_String_Array/Makefile.am b/TAO/tests/Typedef_String_Array/Makefile.am index a30cef0c478..096915cee45 100644 --- a/TAO/tests/Typedef_String_Array/Makefile.am +++ b/TAO/tests/Typedef_String_Array/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.typedef_string_array_server.am - -if BUILD_EXCEPTIONS +## Makefile.typedef_string_array_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.typedef_string_array_server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +64,7 @@ server_SOURCES = \ testC.cpp \ testImpl.cpp \ testS.cpp \ - testC.h \ - testC.inl \ - testImpl.h \ - testS.h \ - testS.inl + testImpl.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -78,27 +78,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 = \ @@ -110,10 +89,7 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + testImpl.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc index a28ade36239..c01bab7197e 100644 --- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc +++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc @@ -1,17 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*server): taoserver { + after += *idl Source_Files { server.cpp testImpl.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } project(*client): taoclient, anytypecode { + after += *idl after += *server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/UNKNOWN_Exception/Makefile.am b/TAO/tests/UNKNOWN_Exception/Makefile.am index dc66b267337..7193df28da0 100644 --- a/TAO/tests/UNKNOWN_Exception/Makefile.am +++ b/TAO/tests/UNKNOWN_Exception/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.UNKNOWN_Exception_Server.am - -if BUILD_EXCEPTIONS +## Makefile.UNKNOWN_Exception_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.UNKNOWN_Exception_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -58,11 +62,7 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp \ testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + testS.cpp server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -76,27 +76,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 = \ @@ -107,11 +86,7 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + testC.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc index 7160291f272..875eebbdd8f 100644 --- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc +++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc @@ -1,17 +1,35 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): taoserver { + after += *idl Source_Files { server.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } project(*Client): taoclient, anytypecode { + after += *idl after += *Server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + } + IDL_Files { + } } - |