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 | 0ecf4d2a80379fcab5dd4d50174c0648ecee7111 (patch) | |
| tree | 0cae2eb766a50faa8f7680a73497a774c0d219c5 /TAO/tests/Cache_Growth_Test | |
| parent | 1f34a6f62672f023a769f37920d2e0197c8df3e3 (diff) | |
| download | ATCD-0ecf4d2a80379fcab5dd4d50174c0648ecee7111.tar.gz | |
ChangeLogTag: Sun Dec 10 20:43:26 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/tests/Cache_Growth_Test')
| -rw-r--r-- | TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc | 21 | ||||
| -rw-r--r-- | TAO/tests/Cache_Growth_Test/Makefile.am | 52 |
2 files changed, 34 insertions, 39 deletions
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 \ |