diff options
Diffstat (limited to 'TAO/performance-tests/Cubit')
5 files changed, 11 insertions, 6 deletions
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc index 3d6ccc86d5f..c0c97e91f12 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc @@ -3,7 +3,6 @@ project(*client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba { after += IDL_Cubit_Server - avoids += ace_for_tao idlflags += -Gd Source_Files { diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc index b6f0ceda21a..fb8d3c5430a 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc @@ -12,7 +12,7 @@ project(*IDL): taoidldefaults, strategies { project(*Server): taoexe, utils, portableserver, strategies { after += *IDL - avoids += ace_for_tao + Source_Files { RTI_IO.cpp Cubit_i.cpp @@ -29,7 +29,7 @@ project(*Server): taoexe, utils, portableserver, strategies { project(*client): taoexe, portableserver, strategies { after += *IDL - avoids += ace_for_tao + Source_Files { RTI_IO.cpp Cubit_Client.cpp @@ -41,9 +41,9 @@ project(*client): taoexe, portableserver, strategies { } } -project(*collocation): taoserver, utils, strategies { +project(*collocation): taoexe, utils, portableserver, strategies { after += *IDL - avoids += ace_for_tao + // Note : You can't just prepend collocation/ to the exename // to get it to ouput to that directory. It won't go // to the right place on some platforms. (Windows) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am index 5bae77a0af9..2285263f2ab 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.IDL_Cubit_IDL.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ cubitC.cpp \ @@ -49,6 +50,7 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP) noinst_HEADERS = \ cubit.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.IDL_Cubit_Client.am diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc index 4ad1b1fe271..d5cc27cdc06 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc @@ -27,7 +27,7 @@ project(*server): taoexe, utils, portableserver, strategies { project(*client): taoexe, utils, portableserver, strategies { after += *IDL - avoids += ace_for_tao + Source_Files { Timer.cpp Globals.cpp diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am index 0254eb4a88a..1da3c7e2ddc 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.MT_Cubit_IDL.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ cubitC.cpp \ @@ -49,6 +50,7 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP) noinst_HEADERS = \ cubit.idl +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Makefile.MT_Cubit_Client.am @@ -98,6 +100,7 @@ endif BUILD_EXCEPTIONS ## Makefile.MT_Cubit_Server.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -131,6 +134,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. |