diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-24 13:30:16 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-24 13:30:16 +0000 |
| commit | 841c26516d4e9908112e9e126f0b3412688a526f (patch) | |
| tree | 36ada4c50cefd5d3cd29c90be6801b8c873a731e | |
| parent | a660d778db0db126295ea1d87b0f47341f46f2c8 (diff) | |
| download | ATCD-841c26516d4e9908112e9e126f0b3412688a526f.tar.gz | |
ChangeLogTag: Fri Nov 24 13:24:56 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am | 2 | ||||
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 36d3fb2ca0f..955c6327b55 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Nov 24 13:24:56 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am: + * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am: + + Regenerated. + Fri Nov 24 13:21:52 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * configure.ac: diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am index 8470945d94a..7d6cf80f146 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am @@ -21,6 +21,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ cubitC.cpp \ @@ -71,6 +72,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am index dc8f6570dcd..5bae77a0af9 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am @@ -124,6 +124,7 @@ endif BUILD_EXCEPTIONS ## Makefile.IDL_Cubit_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -156,6 +157,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. |