summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog50
-rw-r--r--ACE/examples/APG/Active_Objects/active_objects.mpc6
-rw-r--r--ACE/examples/APG/Config/config.mpc3
-rw-r--r--ACE/examples/APG/Containers/containers.mpc3
-rw-r--r--ACE/examples/APG/Misc_IPC/misc_ipc.mpc6
-rw-r--r--ACE/examples/APG/Naming/naming.mpc15
-rw-r--r--ACE/examples/APG/Proactor/proactor.mpc3
-rw-r--r--ACE/examples/APG/Processes/processes.mpc12
-rw-r--r--ACE/examples/APG/Shared_Memory/shared_memory.mpc15
-rw-r--r--ACE/examples/APG/Streams/streams.mpc3
-rw-r--r--ACE/examples/APG/Svc_Config/svc_config.mpc9
-rw-r--r--ACE/examples/APG/ThreadPools/threadpools.mpc3
-rw-r--r--ACE/examples/APG/ThreadSafety/threadsafety.mpc6
-rw-r--r--ACE/examples/ASX/Event_Server/Event_Server/Event.mpc3
-rw-r--r--ACE/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc3
-rw-r--r--ACE/examples/C++NPv1/C++NPv1.mpc24
-rw-r--r--ACE/examples/C++NPv2/C++NPv2.mpc16
-rw-r--r--ACE/examples/Connection/blocking/Connection_Blocking.mpc6
-rw-r--r--ACE/examples/Connection/misc/Connection_Misc.mpc3
-rw-r--r--ACE/examples/Connection/non_blocking/Connection_Non_Blocking.mpc6
-rw-r--r--ACE/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc3
-rw-r--r--ACE/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc3
-rw-r--r--ACE/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc9
-rw-r--r--ACE/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc3
-rw-r--r--ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc18
-rw-r--r--ACE/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc18
-rw-r--r--ACE/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc9
-rw-r--r--ACE/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc3
-rw-r--r--ACE/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc3
-rw-r--r--ACE/examples/Misc/Misc.mpc3
-rw-r--r--ACE/examples/Naming/Naming.mpc12
-rw-r--r--ACE/examples/OS/Process/OS_Process.mpc3
-rw-r--r--ACE/examples/QOS/Diffserv/QOS_Diffserv.mpc3
-rw-r--r--ACE/examples/Reactor/Dgram/Reactor_Dgram.mpc3
-rw-r--r--ACE/examples/Reactor/FIFO/Reactor_FIFO.mpc6
-rw-r--r--ACE/examples/Reactor/Proactor/Proactor.mpc27
-rw-r--r--ACE/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc9
-rw-r--r--ACE/examples/Semaphores/Semaphores.mpc6
-rw-r--r--ACE/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc21
-rw-r--r--ACE/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc6
-rw-r--r--ACE/examples/Shared_Malloc/Shared_Malloc.mpc12
-rw-r--r--ACE/examples/Shared_Memory/Shared_Memory.mpc6
-rw-r--r--ACE/examples/Synch/Synch.mpc3
-rw-r--r--ACE/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc12
-rw-r--r--ACE/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc6
-rw-r--r--ACE/examples/Threads/Threads.mpc12
-rw-r--r--ACE/examples/Web_Crawler/Web_Crawler.mpc3
47 files changed, 179 insertions, 238 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 255ade0a396..c7d7f38e29b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,53 @@
+Wed Apr 29 13:52:12 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/APG/Active_Objects/active_objects.mpc
+ * examples/APG/Config/config.mpc
+ * examples/APG/Containers/containers.mpc
+ * examples/APG/Misc_IPC/misc_ipc.mpc
+ * examples/APG/Naming/naming.mpc
+ * examples/APG/Proactor/proactor.mpc
+ * examples/APG/Processes/processes.mpc
+ * examples/APG/Shared_Memory/shared_memory.mpc
+ * examples/APG/Streams/streams.mpc
+ * examples/APG/Svc_Config/svc_config.mpc
+ * examples/APG/ThreadPools/threadpools.mpc
+ * examples/APG/ThreadSafety/threadsafety.mpc
+ * examples/ASX/Event_Server/Event_Server/Event.mpc
+ * examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc
+ * examples/C++NPv1/C++NPv1.mpc
+ * examples/C++NPv2/C++NPv2.mpc
+ * examples/Connection/blocking/Connection_Blocking.mpc
+ * examples/Connection/misc/Connection_Misc.mpc
+ * examples/Connection/non_blocking/Connection_Non_Blocking.mpc
+ * examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc
+ * examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc
+ * examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc
+ * examples/IPC_SAP/FILE_SAP/file_sap_client.mpc
+ * examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
+ * examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc
+ * examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc
+ * examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc
+ * examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc
+ * examples/Misc/Misc.mpc
+ * examples/Naming/Naming.mpc
+ * examples/OS/Process/OS_Process.mpc
+ * examples/QOS/Diffserv/QOS_Diffserv.mpc
+ * examples/Reactor/Dgram/Reactor_Dgram.mpc
+ * examples/Reactor/FIFO/Reactor_FIFO.mpc
+ * examples/Reactor/Proactor/Proactor.mpc
+ * examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc
+ * examples/Semaphores/Semaphores.mpc
+ * examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc
+ * examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc
+ * examples/Shared_Malloc/Shared_Malloc.mpc
+ * examples/Shared_Memory/Shared_Memory.mpc
+ * examples/Synch/Synch.mpc
+ * examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc
+ * examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc
+ * examples/Threads/Threads.mpc
+ * examples/Web_Crawler/Web_Crawler.mpc
+ Use the avoids_ace_for_tao base project
+
Wed Apr 29 09:47:12 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/MakeProjectCreator/templates/gnu.mpd:
diff --git a/ACE/examples/APG/Active_Objects/active_objects.mpc b/ACE/examples/APG/Active_Objects/active_objects.mpc
index 44fe88bfd30..51b7c6f1f1e 100644
--- a/ACE/examples/APG/Active_Objects/active_objects.mpc
+++ b/ACE/examples/APG/Active_Objects/active_objects.mpc
@@ -1,16 +1,14 @@
// -*- MPC -*-
// $Id$
-project(AO) : aceexe {
- avoids += ace_for_tao
+project(AO) : aceexe, avoids_ace_for_tao {
exename = AO
Source_Files {
AO.cpp
}
}
-project(AO2) : aceexe {
- avoids += ace_for_tao
+project(AO2) : aceexe, avoids_ace_for_tao {
exename = AO2
Source_Files {
AO2.cpp
diff --git a/ACE/examples/APG/Config/config.mpc b/ACE/examples/APG/Config/config.mpc
index 5b705d144bc..1e2b8dc2146 100644
--- a/ACE/examples/APG/Config/config.mpc
+++ b/ACE/examples/APG/Config/config.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*HA Status) : aceexe {
- avoids += ace_for_tao
+project(*HA Status) : aceexe, avoids_ace_for_tao {
exename = HA_Status
Source_Files {
HA_Status.cpp
diff --git a/ACE/examples/APG/Containers/containers.mpc b/ACE/examples/APG/Containers/containers.mpc
index d08ef9133aa..a49ede94ef4 100644
--- a/ACE/examples/APG/Containers/containers.mpc
+++ b/ACE/examples/APG/Containers/containers.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(DLList) : aceexe {
- avoids += ace_for_tao
+project(DLList) : aceexe, avoids_ace_for_tao {
exename = DLList
Source_Files {
DLList.cpp
diff --git a/ACE/examples/APG/Misc_IPC/misc_ipc.mpc b/ACE/examples/APG/Misc_IPC/misc_ipc.mpc
index 47e1c34758b..e3c3e7d1b6b 100644
--- a/ACE/examples/APG/Misc_IPC/misc_ipc.mpc
+++ b/ACE/examples/APG/Misc_IPC/misc_ipc.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(UDP Broadcast) : aceexe {
- avoids += ace_for_tao
+project(UDP Broadcast) : aceexe, avoids_ace_for_tao {
exename = UDP_Broadcast
Source_Files {
UDP_Broadcast.cpp
@@ -16,8 +15,7 @@ project(UDP Multicast) : aceexe {
}
}
-project(UDP Unicast) : aceexe {
- avoids += ace_for_tao
+project(UDP Unicast) : aceexe, avoids_ace_for_tao {
exename = UDP_Unicast
Source_Files {
UDP_Unicast.cpp
diff --git a/ACE/examples/APG/Naming/naming.mpc b/ACE/examples/APG/Naming/naming.mpc
index 1915280b379..0bbc4e92e13 100644
--- a/ACE/examples/APG/Naming/naming.mpc
+++ b/ACE/examples/APG/Naming/naming.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(Netlocal) : aceexe {
- avoids += ace_for_tao
+project(Netlocal) : aceexe, avoids_ace_for_tao {
requires += ace_other
exename = Netlocal
Source_Files {
@@ -11,8 +10,7 @@ project(Netlocal) : aceexe {
}
}
-project(Netlocal Reader) : aceexe {
- avoids += ace_for_tao
+project(Netlocal Reader) : aceexe, avoids_ace_for_tao {
requires += ace_other
exename = Netlocal_reader
Source_Files {
@@ -22,8 +20,7 @@ project(Netlocal Reader) : aceexe {
}
}
-project(Nodelocal) : aceexe {
- avoids += ace_for_tao
+project(Nodelocal) : aceexe, avoids_ace_for_tao {
requires += ace_other
exename = Nodelocal
Source_Files {
@@ -32,8 +29,7 @@ project(Nodelocal) : aceexe {
}
}
-project(Nodelocal Shared) : aceexe {
- avoids += ace_for_tao
+project(Nodelocal Shared) : aceexe, avoids_ace_for_tao {
requires += ace_other
exename = Nodelocal_shared
Source_Files {
@@ -42,8 +38,7 @@ project(Nodelocal Shared) : aceexe {
}
}
-project(Nodelocal Shared Reader) : aceexe {
- avoids += ace_for_tao
+project(Nodelocal Shared Reader) : aceexe, avoids_ace_for_tao {
requires += ace_other
exename = Nodelocal_shared_reader
Source_Files {
diff --git a/ACE/examples/APG/Proactor/proactor.mpc b/ACE/examples/APG/Proactor/proactor.mpc
index 85ef950ae66..b6370fdc4c4 100644
--- a/ACE/examples/APG/Proactor/proactor.mpc
+++ b/ACE/examples/APG/Proactor/proactor.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(HA Proactive Status) : aceexe {
- avoids += ace_for_tao
+project(HA Proactive Status) : aceexe, avoids_ace_for_tao {
exename = HA_Proactive_Status
Source_Files {
HA_Proactive_Status.cpp
diff --git a/ACE/examples/APG/Processes/processes.mpc b/ACE/examples/APG/Processes/processes.mpc
index a7cb01040bb..ccc40de827f 100644
--- a/ACE/examples/APG/Processes/processes.mpc
+++ b/ACE/examples/APG/Processes/processes.mpc
@@ -1,32 +1,28 @@
// -*- MPC -*-
// $Id$
-project(Process Manager Death) : aceexe {
- avoids += ace_for_tao
+project(Process Manager Death) : aceexe, avoids_ace_for_tao {
exename = Process_Manager_Death
Source_Files {
Process_Manager_Death.cpp
}
}
-project(Process Manager Spawn) : aceexe {
- avoids += ace_for_tao
+project(Process Manager Spawn) : aceexe, avoids_ace_for_tao {
exename = Process_Manager_Spawn
Source_Files {
Process_Manager_Spawn.cpp
}
}
-project(Process Mutex) : aceexe {
- avoids += ace_for_tao
+project(Process Mutex) : aceexe, avoids_ace_for_tao {
exename = Process_Mutex
Source_Files {
Process_Mutex.cpp
}
}
-project(Spawn) : aceexe {
- avoids += ace_for_tao
+project(Spawn) : aceexe, avoids_ace_for_tao {
exename = Spawn
Source_Files {
Spawn.cpp
diff --git a/ACE/examples/APG/Shared_Memory/shared_memory.mpc b/ACE/examples/APG/Shared_Memory/shared_memory.mpc
index 2cf2400ef8e..234fe033297 100644
--- a/ACE/examples/APG/Shared_Memory/shared_memory.mpc
+++ b/ACE/examples/APG/Shared_Memory/shared_memory.mpc
@@ -1,40 +1,35 @@
// -*- MPC -*-
// $Id$
-project(*Hash Map) : aceexe {
- avoids += ace_for_tao
+project(*Hash Map) : aceexe, avoids_ace_for_tao {
exename = Hash_Map
Source_Files {
Hash_Map.cpp
}
}
-project(Malloc) : aceexe {
- avoids += ace_for_tao
+project(Malloc) : aceexe, avoids_ace_for_tao {
exename = Malloc
Source_Files {
Malloc.cpp
}
}
-project(Mem Map) : aceexe {
- avoids += ace_for_tao
+project(Mem Map) : aceexe, avoids_ace_for_tao {
exename = Mem_Map
Source_Files {
Mem_Map.cpp
}
}
-project(PI Malloc) : aceexe {
- avoids += ace_for_tao
+project(PI Malloc) : aceexe, avoids_ace_for_tao {
exename = PI_Malloc
Source_Files {
PI_Malloc.cpp
}
}
-project(Pool Growth) : aceexe {
- avoids += ace_for_tao
+project(Pool Growth) : aceexe, avoids_ace_for_tao {
exename = Pool_Growth
Source_Files {
Pool_Growth.cpp
diff --git a/ACE/examples/APG/Streams/streams.mpc b/ACE/examples/APG/Streams/streams.mpc
index 6756a1bb877..588bdc0dd27 100644
--- a/ACE/examples/APG/Streams/streams.mpc
+++ b/ACE/examples/APG/Streams/streams.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(Answerer) : aceexe, threads {
- avoids += ace_for_tao
+project(Answerer) : aceexe, threads, avoids_ace_for_tao {
exename = Answerer
Source_Files {
Answerer.cpp
diff --git a/ACE/examples/APG/Svc_Config/svc_config.mpc b/ACE/examples/APG/Svc_Config/svc_config.mpc
index ddc33b97c53..cc156a940cb 100644
--- a/ACE/examples/APG/Svc_Config/svc_config.mpc
+++ b/ACE/examples/APG/Svc_Config/svc_config.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*HA Status) : acelib {
- avoids += ace_for_tao
+project(*HA Status) : acelib, avoids_ace_for_tao {
sharedname = HA_Status
dynamicflags = HASTATUS_BUILD_DLL
Source_Files {
@@ -10,16 +9,14 @@ project(*HA Status) : acelib {
}
}
-project(HA Configurable Server Dynamic) : aceexe {
- avoids += ace_for_tao
+project(HA Configurable Server Dynamic) : aceexe, avoids_ace_for_tao {
exename = HA_Configurable_Server_Dynamic
Source_Files {
HA_Configurable_Server_Dynamic.cpp
}
}
-project(HA Configurable Server Static) : aceexe {
- avoids += ace_for_tao
+project(HA Configurable Server Static) : aceexe, avoids_ace_for_tao {
exename = HA_Configurable_Server_Static
Source_Files {
HA_Configurable_Server_Static.cpp
diff --git a/ACE/examples/APG/ThreadPools/threadpools.mpc b/ACE/examples/APG/ThreadPools/threadpools.mpc
index 1bb9a860920..f1f1345db00 100644
--- a/ACE/examples/APG/ThreadPools/threadpools.mpc
+++ b/ACE/examples/APG/ThreadPools/threadpools.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(Futures) : aceexe {
- avoids += ace_for_tao
+project(Futures) : aceexe, avoids_ace_for_tao {
exename = Futures
Source_Files {
Futures.cpp
diff --git a/ACE/examples/APG/ThreadSafety/threadsafety.mpc b/ACE/examples/APG/ThreadSafety/threadsafety.mpc
index 3598d274917..97967989572 100644
--- a/ACE/examples/APG/ThreadSafety/threadsafety.mpc
+++ b/ACE/examples/APG/ThreadSafety/threadsafety.mpc
@@ -22,16 +22,14 @@ project(Mutex) : aceexe {
}
}
-project(RW Lock) : aceexe {
- avoids += ace_for_tao
+project(RW Lock) : aceexe, avoids_ace_for_tao {
exename = RW_Lock
Source_Files {
RW_Lock.cpp
}
}
-project(Semaphore) : aceexe {
- avoids += ace_for_tao
+project(Semaphore) : aceexe, avoids_ace_for_tao {
exename = Semaphore
Source_Files {
Semaphore.cpp
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Event.mpc b/ACE/examples/ASX/Event_Server/Event_Server/Event.mpc
index f99e912ce04..7503fec4763 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Event.mpc
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Event.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*Server) : aceexe {
- avoids += ace_for_tao
+project(*Server) : aceexe, avoids_ace_for_tao {
exename = Event_Server
Source_Files {
Consumer_Router.cpp
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc b/ACE/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc
index a4c93dc1fdb..a4c4334fc31 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc
+++ b/ACE/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*Server) : aceexe {
- avoids += ace_for_tao
+project(*Server) : aceexe, avoids_ace_for_tao {
exename = UPIPE_Event_Server
Source_Files {
Consumer_Router.cpp
diff --git a/ACE/examples/C++NPv1/C++NPv1.mpc b/ACE/examples/C++NPv1/C++NPv1.mpc
index 2cc6967e831..5d5a8fb55f1 100644
--- a/ACE/examples/C++NPv1/C++NPv1.mpc
+++ b/ACE/examples/C++NPv1/C++NPv1.mpc
@@ -1,8 +1,8 @@
// -*- MPC -*-
// $Id$
-project(*Iterative_Logging_Server) : aceexe {
- avoids += uses_wchar ace_for_tao
+project(*Iterative_Logging_Server) : aceexe, avoids_ace_for_tao {
+ avoids += uses_wchar
exename = iterative_logging_server
Source_Files {
Iterative_Logging_Server.cpp
@@ -19,8 +19,8 @@ project(*Logging_Client) : aceexe {
}
}
-project(*PPC_Logging_Server) : aceexe {
- avoids += uses_wchar ace_for_tao
+project(*PPC_Logging_Server) : aceexe, avoids_ace_for_tao {
+ avoids += uses_wchar
exename = ppc_logging_server
Source_Files {
Process_Per_Connection_Logging_Server.cpp
@@ -29,8 +29,8 @@ project(*PPC_Logging_Server) : aceexe {
}
}
-project(*Reactive_Logging_Server) : aceexe {
- avoids += uses_wchar ace_for_tao
+project(*Reactive_Logging_Server) : aceexe, avoids_ace_for_tao {
+ avoids += uses_wchar
exename = reactive_logging_server
Source_Files {
Reactive_Logging_Server.cpp
@@ -39,8 +39,8 @@ project(*Reactive_Logging_Server) : aceexe {
}
}
-project(*Reactive_Logging_Server_Ex) : aceexe {
- avoids += uses_wchar ace_for_tao
+project(*Reactive_Logging_Server_Ex) : aceexe, avoids_ace_for_tao {
+ avoids += uses_wchar
exename = reactive_logging_server_ex
Source_Files {
Reactive_Logging_Server_Ex.cpp
@@ -49,8 +49,8 @@ project(*Reactive_Logging_Server_Ex) : aceexe {
}
}
-project(*RTTPC_Logging_Server) : aceexe {
- avoids += uses_wchar ace_for_tao
+project(*RTTPC_Logging_Server) : aceexe, avoids_ace_for_tao {
+ avoids += uses_wchar
exename = RTTPC_logging_server
Source_Files {
RT_Thread_Per_Connection_Logging_Server.cpp
@@ -59,8 +59,8 @@ project(*RTTPC_Logging_Server) : aceexe {
}
}
-project(*TPC_Logging_Server) : aceexe {
- avoids += uses_wchar ace_for_tao
+project(*TPC_Logging_Server) : aceexe, avoids_ace_for_tao {
+ avoids += uses_wchar
exename = tpc_logging_server
Source_Files {
Thread_Per_Connection_Logging_Server.cpp
diff --git a/ACE/examples/C++NPv2/C++NPv2.mpc b/ACE/examples/C++NPv2/C++NPv2.mpc
index c392cb358e2..dc83c833224 100644
--- a/ACE/examples/C++NPv2/C++NPv2.mpc
+++ b/ACE/examples/C++NPv2/C++NPv2.mpc
@@ -98,8 +98,8 @@ project(*SLD) : acelib, avoids_ace_for_tao {
}
}
-project(*SLDex) : acelib {
- avoids += uses_wchar ace_for_tao
+project(*SLDex) : acelib, avoids_ace_for_tao {
+ avoids += uses_wchar
sharedname = SLDex
dynamicflags = SLDEX_BUILD_DLL
specific(gnuace) {
@@ -123,8 +123,8 @@ project(*SR_Configurable_Log_Server) : aceexe {
}
}
-project(*TP_Reactor_Log_Server) : aceexe {
- avoids += uses_wchar ace_for_tao
+project(*TP_Reactor_Log_Server) : aceexe, avoids_ace_for_tao {
+ avoids += uses_wchar
exename = tp_reactor_logging_server
specific(gnuace) {
after += *Reactor_Log_Server
@@ -151,8 +151,8 @@ project(*TPCLS) : acelib, ssl {
}
}
-project(*TPLS) : acelib {
- avoids += uses_wchar ace_for_tao
+project(*TPLS) : acelib, avoids_ace_for_tao {
+ avoids += uses_wchar
sharedname = TPLS
dynamicflags = TPLS_BUILD_DLL
specific(gnuace) {
@@ -166,8 +166,8 @@ project(*TPLS) : acelib {
}
}
-project(*WFMO_Reactor_Log_Server) : aceexe, wfmo {
- avoids += uses_wchar ace_for_tao
+project(*WFMO_Reactor_Log_Server) : aceexe, wfmo, avoids_ace_for_tao {
+ avoids += uses_wchar
exename = wfmo_reactor_logging_server
specific(gnuace) {
after += *Reactor_Log_Server
diff --git a/ACE/examples/Connection/blocking/Connection_Blocking.mpc b/ACE/examples/Connection/blocking/Connection_Blocking.mpc
index 758e2bfbf95..164e1dd34d0 100644
--- a/ACE/examples/Connection/blocking/Connection_Blocking.mpc
+++ b/ACE/examples/Connection/blocking/Connection_Blocking.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*acceptor) : aceexe {
- avoids += ace_for_tao
+project(*acceptor) : aceexe, avoids_ace_for_tao {
exename = acceptor
Source_Files {
SPIPE-acceptor.cpp
@@ -10,8 +9,7 @@ project(*acceptor) : aceexe {
}
}
-project(*connector) : aceexe {
- avoids += ace_for_tao
+project(*connector) : aceexe, avoids_ace_for_tao {
exename = connector
Source_Files {
SPIPE-connector.cpp
diff --git a/ACE/examples/Connection/misc/Connection_Misc.mpc b/ACE/examples/Connection/misc/Connection_Misc.mpc
index a960e604338..f58a648e27a 100644
--- a/ACE/examples/Connection/misc/Connection_Misc.mpc
+++ b/ACE/examples/Connection/misc/Connection_Misc.mpc
@@ -8,8 +8,7 @@ project (*Handler) : aceexe {
}
}
-project (*test_upipe) : aceexe {
- avoids += ace_for_tao
+project (*test_upipe) : aceexe, avoids_ace_for_tao {
exename = test_upipe
Source_Files {
test_upipe.cpp
diff --git a/ACE/examples/Connection/non_blocking/Connection_Non_Blocking.mpc b/ACE/examples/Connection/non_blocking/Connection_Non_Blocking.mpc
index de9ecaea5e0..b6da5bde1a1 100644
--- a/ACE/examples/Connection/non_blocking/Connection_Non_Blocking.mpc
+++ b/ACE/examples/Connection/non_blocking/Connection_Non_Blocking.mpc
@@ -17,8 +17,7 @@ project (*SockServer) : aceexe {
}
}
-project (*LSockClient) : aceexe {
- avoids += ace_for_tao
+project (*LSockClient) : aceexe, avoids_ace_for_tao {
exename = lsock_client
Source_Files {
CPP-connector.cpp
@@ -26,8 +25,7 @@ project (*LSockClient) : aceexe {
}
}
-project (*LSockServer) : aceexe {
- avoids += ace_for_tao
+project (*LSockServer) : aceexe, avoids_ace_for_tao {
exename = lsock_server
Source_Files {
CPP-acceptor.cpp
diff --git a/ACE/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc b/ACE/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc
index a6535c82e82..439f4777409 100644
--- a/ACE/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc
+++ b/ACE/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project : aceexe {
- avoids += ace_for_tao
+project : aceexe, avoids_ace_for_tao {
exename = reader
Source_Files {
reader.cpp
diff --git a/ACE/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc b/ACE/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc
index 75486584b6d..e7774f140bd 100644
--- a/ACE/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc
+++ b/ACE/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project : aceexe {
- avoids += ace_for_tao
+project : aceexe, avoids_ace_for_tao {
exename = writer
Source_Files {
writer.cpp
diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc b/ACE/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc
index 1e6d04447e5..5a144621b09 100644
--- a/ACE/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc
+++ b/ACE/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc
@@ -1,16 +1,14 @@
// -*- MPC -*-
// $Id$
-project(*client) : aceexe {
- avoids += ace_for_tao
+project(*client) : aceexe, avoids_ace_for_tao {
exename = FIFO-client
Source_Files {
FIFO-client.cpp
}
}
-project(*server) : aceexe {
- avoids += ace_for_tao
+project(*server) : aceexe, avoids_ace_for_tao {
exename = FIFO-server
Source_Files {
FIFO-server.cpp
@@ -31,8 +29,7 @@ project(*Msg_Server) : aceexe {
}
}
-project(*test) : aceexe {
- avoids += ace_for_tao
+project(*test) : aceexe, avoids_ace_for_tao {
exename = FIFO-test
Source_Files {
FIFO-test.cpp
diff --git a/ACE/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc b/ACE/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc
index 24f9a2b3a61..f47f7a7c7d7 100644
--- a/ACE/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc
+++ b/ACE/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project : aceexe {
- avoids += ace_for_tao
+project : aceexe, avoids_ace_for_tao {
exename = client
Source_Files {
client.cpp
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
index e2081ed7652..b7fb2b66f46 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
@@ -23,48 +23,42 @@ project(*CPP_inclient) : aceexe {
}
}
-project(*CPP_inserver) : aceexe {
- avoids += ace_for_tao
+project(*CPP_inserver) : aceexe, avoids_ace_for_tao {
exename = CPP-inserver
Source_Files {
CPP-inserver.cpp
}
}
-project(*CPP_memclient) : aceexe {
- avoids += ace_for_tao
+project(*CPP_memclient) : aceexe, avoids_ace_for_tao {
exename = CPP-memclient
Source_Files {
CPP-memclient.cpp
}
}
-project(*CPP_memserver) : aceexe {
- avoids += ace_for_tao
+project(*CPP_memserver) : aceexe, avoids_ace_for_tao {
exename = CPP-memserver
Source_Files {
CPP-memserver.cpp
}
}
-project(*FD_unclient) : aceexe {
- avoids += ace_for_tao
+project(*FD_unclient) : aceexe, avoids_ace_for_tao {
exename = FD-unclient
Source_Files {
FD-unclient.cpp
}
}
-project(*CPP_unclient) : aceexe {
- avoids += ace_for_tao
+project(*CPP_unclient) : aceexe, avoids_ace_for_tao {
exename = CPP-unclient
Source_Files {
CPP-unclient.cpp
}
}
-project(*CPP_unserver) : aceexe {
- avoids += ace_for_tao
+project(*CPP_unserver) : aceexe, avoids_ace_for_tao {
exename = CPP-unserver
Source_Files {
CPP-unserver.cpp
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc b/ACE/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc
index f67fdb7c2a0..4096e4960fe 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc
@@ -1,48 +1,42 @@
// -*- MPC -*-
// $Id$
-project(*client) : aceexe, ssl {
- avoids += ace_for_tao
+project(*client) : aceexe, ssl, avoids_ace_for_tao {
exename = client
Source_Files {
SSL-client.cpp
}
}
-project(*client_simple) : aceexe, ssl {
- avoids += ace_for_tao
+project(*client_simple) : aceexe, ssl, avoids_ace_for_tao {
exename = client-simple
Source_Files {
SSL-client-simple.cpp
}
}
-project(*server) : aceexe, ssl {
- avoids += ace_for_tao
+project(*server) : aceexe, ssl, avoids_ace_for_tao {
exename = server
Source_Files {
SSL-server.cpp
}
}
-project(*server_fancy) : aceexe, ssl {
- avoids += ace_for_tao
+project(*server_fancy) : aceexe, ssl, avoids_ace_for_tao {
exename = server-fancy
Source_Files {
SSL-server-fancy.cpp
}
}
-project(*server_poll) : aceexe, ssl {
- avoids += ace_for_tao
+project(*server_poll) : aceexe, ssl, avoids_ace_for_tao {
exename = server-poll
Source_Files {
SSL-server-poll.cpp
}
}
-project(*server_simple) : aceexe, ssl {
- avoids += ace_for_tao
+project(*server_simple) : aceexe, ssl, avoids_ace_for_tao {
exename = server-simple
Source_Files {
SSL-server-simple.cpp
diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc b/ACE/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc
index d34d8671735..65e65655203 100644
--- a/ACE/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc
+++ b/ACE/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc
@@ -1,24 +1,21 @@
// -*- MPC -*-
// $Id$
-project(*ex1) : aceexe {
- avoids += ace_for_tao
+project(*ex1) : aceexe, avoids_ace_for_tao {
exename = ex1
Source_Files {
ex1.cpp
}
}
-project(*ex2) : aceexe {
- avoids += ace_for_tao
+project(*ex2) : aceexe, avoids_ace_for_tao {
exename = ex2
Source_Files {
ex2.cpp
}
}
-project(*ex3) : aceexe {
- avoids += ace_for_tao
+project(*ex3) : aceexe, avoids_ace_for_tao {
exename = ex3
Source_Files {
ex3.cpp
diff --git a/ACE/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc b/ACE/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc
index 4066ccc2613..33b661b229d 100644
--- a/ACE/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc
+++ b/ACE/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc
@@ -1,7 +1,6 @@
// -*- MPC -*-
// $Id$
-project : aceexe {
+project : aceexe, avoids_ace_for_tao {
exename = test_io
- avoids += ace_for_tao
}
diff --git a/ACE/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc b/ACE/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc
index 368866edb73..9d07999c33b 100644
--- a/ACE/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc
+++ b/ACE/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc
@@ -1,7 +1,6 @@
// -*- MPC -*-
// $Id$
-project : aceexe {
- avoids += ace_for_tao
+project : aceexe, avoids_ace_for_tao {
exename = file-reverse
}
diff --git a/ACE/examples/Misc/Misc.mpc b/ACE/examples/Misc/Misc.mpc
index 84be1f4d1e6..68eeb0b5a2e 100644
--- a/ACE/examples/Misc/Misc.mpc
+++ b/ACE/examples/Misc/Misc.mpc
@@ -15,8 +15,7 @@ project(*test_get_opt) : aceexe {
}
}
-project(*test_profile_timer) : aceexe {
- avoids += ace_for_tao
+project(*test_profile_timer) : aceexe, avoids_ace_for_tao {
exename = test_profile_timer
Source_Files {
test_profile_timer.cpp
diff --git a/ACE/examples/Naming/Naming.mpc b/ACE/examples/Naming/Naming.mpc
index 0738944434f..760a8021f36 100644
--- a/ACE/examples/Naming/Naming.mpc
+++ b/ACE/examples/Naming/Naming.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*multiple_contexts) : aceexe {
- avoids += ace_for_tao
+project(*multiple_contexts) : aceexe, avoids_ace_for_tao {
requires += ace_other
exename = multiple_contexts
Source_Files {
@@ -10,8 +9,7 @@ project(*multiple_contexts) : aceexe {
}
}
-project(*non_existent) : aceexe {
- avoids += ace_for_tao
+project(*non_existent) : aceexe, avoids_ace_for_tao {
requires += ace_other
exename = non_existent
Source_Files {
@@ -19,8 +17,7 @@ project(*non_existent) : aceexe {
}
}
-project(*writers) : aceexe {
- avoids += ace_for_tao
+project(*writers) : aceexe, avoids_ace_for_tao {
requires += ace_other
exename = writers
Source_Files {
@@ -28,8 +25,7 @@ project(*writers) : aceexe {
}
}
-project(*open) : aceexe {
- avoids += ace_for_tao
+project(*open) : aceexe, avoids_ace_for_tao {
requires += ace_other
exename = open
Source_Files {
diff --git a/ACE/examples/OS/Process/OS_Process.mpc b/ACE/examples/OS/Process/OS_Process.mpc
index ea2e08ec454..433efdf7877 100644
--- a/ACE/examples/OS/Process/OS_Process.mpc
+++ b/ACE/examples/OS/Process/OS_Process.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*imore) : aceexe {
- avoids += ace_for_tao
+project(*imore) : aceexe, avoids_ace_for_tao {
exename = imore
Source_Files {
imore.cpp
diff --git a/ACE/examples/QOS/Diffserv/QOS_Diffserv.mpc b/ACE/examples/QOS/Diffserv/QOS_Diffserv.mpc
index 3e66fbee34a..39f5272ad55 100644
--- a/ACE/examples/QOS/Diffserv/QOS_Diffserv.mpc
+++ b/ACE/examples/QOS/Diffserv/QOS_Diffserv.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*client) : aceexe, qos {
- avoids += ace_for_tao
+project(*client) : aceexe, qos, avoids_ace_for_tao {
exename = client
requires += qos
Source_Files {
diff --git a/ACE/examples/Reactor/Dgram/Reactor_Dgram.mpc b/ACE/examples/Reactor/Dgram/Reactor_Dgram.mpc
index 1040aedc184..64342526293 100644
--- a/ACE/examples/Reactor/Dgram/Reactor_Dgram.mpc
+++ b/ACE/examples/Reactor/Dgram/Reactor_Dgram.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*CO) : aceexe {
- avoids += ace_for_tao
+project(*CO) : aceexe, avoids_ace_for_tao {
exename = codgram
Source_Files {
CODgram.cpp
diff --git a/ACE/examples/Reactor/FIFO/Reactor_FIFO.mpc b/ACE/examples/Reactor/FIFO/Reactor_FIFO.mpc
index 072ec5412b8..911c66f64ad 100644
--- a/ACE/examples/Reactor/FIFO/Reactor_FIFO.mpc
+++ b/ACE/examples/Reactor/FIFO/Reactor_FIFO.mpc
@@ -1,16 +1,14 @@
// -*- MPC -*-
// $Id$
-project(*client) : aceexe {
- avoids += ace_for_tao
+project(*client) : aceexe, avoids_ace_for_tao {
exename = client
Source_Files {
client.cpp
}
}
-project(*server) : aceexe {
- avoids += ace_for_tao
+project(*server) : aceexe, avoids_ace_for_tao {
exename = server
Source_Files {
server.cpp
diff --git a/ACE/examples/Reactor/Proactor/Proactor.mpc b/ACE/examples/Reactor/Proactor/Proactor.mpc
index edb0736d726..28daf51b485 100644
--- a/ACE/examples/Reactor/Proactor/Proactor.mpc
+++ b/ACE/examples/Reactor/Proactor/Proactor.mpc
@@ -1,72 +1,63 @@
// -*- MPC -*-
// $Id$
-project(*cancel) : aceexe {
- avoids += ace_for_tao
+project(*cancel) : aceexe, avoids_ace_for_tao {
exename = test_cancel
Source_Files {
test_cancel.cpp
}
}
-project(*end_event_loops) : aceexe {
- avoids += ace_for_tao
+project(*end_event_loops) : aceexe, avoids_ace_for_tao {
exename = test_end_event_loop
Source_Files {
test_end_event_loop.cpp
}
}
-project(*multiple_loops) : aceexe {
- avoids += ace_for_tao
+project(*multiple_loops) : aceexe, avoids_ace_for_tao {
exename = test_multiple_loops
Source_Files {
test_multiple_loops.cpp
}
}
-project(*post_completions) : aceexe {
- avoids += ace_for_tao
+project(*post_completions) : aceexe, avoids_ace_for_tao {
exename = test_post_completions
Source_Files {
post_completions.cpp
}
}
-project(*proactor) : aceexe {
- avoids += ace_for_tao
+project(*proactor) : aceexe, avoids_ace_for_tao {
exename = test_proactor
Source_Files {
test_proactor.cpp
}
}
-// project(*proactor2) : aceexe {
-// avoids += ace_for_tao
+// project(*proactor2) : aceexe, avoids_ace_for_tao {
// exename = test_proactor2
// Source_Files {
// test_proactor2.cpp
// }
// }
-// project(*proactor3) : aceexe {
-// avoids += ace_for_tao
+// project(*proactor3) : aceexe, avoids_ace_for_tao {
// exename = test_proactor3
// Source_Files {
// test_proactor3.cpp
// }
// }
-project(*timeout) : aceexe {
- avoids += ace_for_tao
+project(*timeout) : aceexe, avoids_ace_for_tao {
exename = test_timeout
Source_Files {
test_timeout.cpp
}
}
-project(*udp_proactor) : aceexe {
- avoids += ace_for_tao
+project(*udp_proactor) : aceexe, avoids_ace_for_tao {
exename = test_udp_proactor
Source_Files {
test_udp_proactor.cpp
diff --git a/ACE/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc b/ACE/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc
index 3663aa7c6e1..c0a48d52768 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc
+++ b/ACE/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc
@@ -71,8 +71,7 @@ project(*Registration): aceexe, wfmo {
}
}
-project(*Registry_Changes): aceexe, wfmo {
- avoids += ace_for_tao
+project(*Registry_Changes): aceexe, wfmo, avoids_ace_for_tao {
exename = registry_changes
Source_Files {
Registry_Changes.cpp
@@ -93,8 +92,7 @@ project(*Suspended_Removals): aceexe, wfmo {
}
}
-project(*Talker): aceexe, wfmo {
- avoids += ace_for_tao
+project(*Talker): aceexe, wfmo, avoids_ace_for_tao {
exename = talker
Source_Files {
Talker.cpp
@@ -108,8 +106,7 @@ project(*Timeouts): aceexe, wfmo {
}
}
-project(*Window_Messages): aceexe, wfmo {
- avoids += ace_for_tao
+project(*Window_Messages): aceexe, wfmo, avoids_ace_for_tao {
exename = window_messages
Source_Files {
Window_Messages.cpp
diff --git a/ACE/examples/Semaphores/Semaphores.mpc b/ACE/examples/Semaphores/Semaphores.mpc
index 51040a647ef..dbcefd53827 100644
--- a/ACE/examples/Semaphores/Semaphores.mpc
+++ b/ACE/examples/Semaphores/Semaphores.mpc
@@ -1,16 +1,14 @@
// -*- MPC -*-
// $Id$
-project(*starter) : aceexe {
- avoids += ace_for_tao
+project(*starter) : aceexe, avoids_ace_for_tao {
exename = starter
Source_Files {
starter.cpp
}
}
-project(*worker) : aceexe {
- avoids += ace_for_tao
+project(*worker) : aceexe, avoids_ace_for_tao {
exename = worker
Source_Files {
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc b/ACE/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc
index 6876c4aac4d..d8847545cc8 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc
+++ b/ACE/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc
@@ -1,22 +1,19 @@
// -*- MPC -*-
// $Id$
-project(*loc dgram) : aceexe {
- avoids += ace_for_tao
+project(*loc dgram) : aceexe, avoids_ace_for_tao {
exename = local_dgram_test
Source_Files {
local_dgram_client_test.cpp
}
}
-project(*loc fifo) : aceexe {
- avoids += ace_for_tao
+project(*loc fifo) : aceexe, avoids_ace_for_tao {
exename = local_fifo_test
Source_Files {
local_fifo_client_test.cpp
}
}
-project(*loc pipe) : aceexe {
- avoids += ace_for_tao
+project(*loc pipe) : aceexe, avoids_ace_for_tao {
exename = local_pipe_test
Source_Files {
local_pipe_client_test.cpp
@@ -28,15 +25,13 @@ project(*loc spipe) : aceexe {
local_spipe_client_test.cpp
}
}
-project(*loc stream) : aceexe {
- avoids += ace_for_tao
+project(*loc stream) : aceexe, avoids_ace_for_tao {
exename = local_stream_test
Source_Files {
local_stream_client_test.cpp
}
}
-project(*rem dgram) : aceexe {
- avoids += ace_for_tao
+project(*rem dgram) : aceexe, avoids_ace_for_tao {
exename = remote_dgram_test
Source_Files {
remote_dgram_client_test.cpp
@@ -48,8 +43,7 @@ project(*rem svc dir) : aceexe {
remote_service_directory_test.cpp
}
}
-project(*rem stream) : aceexe {
- avoids += ace_for_tao
+project(*rem stream) : aceexe, avoids_ace_for_tao {
exename = remote_stream_test
Source_Files {
remote_stream_client_test.cpp
@@ -61,8 +55,7 @@ project(*rem thr_stream) : aceexe {
remote_thr_stream_client_test.cpp
}
}
-project(*bcast) : aceexe {
- avoids += ace_for_tao
+project(*bcast) : aceexe, avoids_ace_for_tao {
exename = remote_broadcast_test
Source_Files {
broadcast_client_test.cpp
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc b/ACE/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc
index c44b40c6e32..900cd9635d2 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*Lib) : acelib {
- avoids += ace_for_tao
+project(*Lib) : acelib, avoids_ace_for_tao {
sharedname = IPC_Tests_Server
dynamicflags += ACE_BUILD_SVC_DLL
Source_Files {
@@ -19,8 +18,7 @@ project(*Lib) : acelib {
}
}
-project(*test) : aceexe {
- avoids += ace_for_tao
+project(*test) : aceexe, avoids_ace_for_tao {
exename = server_test
after += Svc_Cfg_IPC_Server_Lib
libs += IPC_Tests_Server
diff --git a/ACE/examples/Shared_Malloc/Shared_Malloc.mpc b/ACE/examples/Shared_Malloc/Shared_Malloc.mpc
index 42753246815..3f30d3bd6f0 100644
--- a/ACE/examples/Shared_Malloc/Shared_Malloc.mpc
+++ b/ACE/examples/Shared_Malloc/Shared_Malloc.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project : aceexe {
- avoids += ace_for_tao
+project : aceexe, avoids_ace_for_tao {
exename = malloc
Source_Files {
Malloc.cpp
@@ -10,8 +9,7 @@ project : aceexe {
test_malloc.cpp
}
}
-project(*multiple) : aceexe {
- avoids += ace_for_tao
+project(*multiple) : aceexe, avoids_ace_for_tao {
exename = multiple
Source_Files {
Malloc.cpp
@@ -19,15 +17,13 @@ project(*multiple) : aceexe {
test_multiple_mallocs.cpp
}
}
-project(*persistence) : aceexe {
- avoids += ace_for_tao
+project(*persistence) : aceexe, avoids_ace_for_tao {
exename = persistence
Source_Files {
test_persistence.cpp
}
}
-project(*posind) : aceexe {
- avoids += ace_for_tao
+project(*posind) : aceexe, avoids_ace_for_tao {
exename = posind
Source_Files {
Malloc.cpp
diff --git a/ACE/examples/Shared_Memory/Shared_Memory.mpc b/ACE/examples/Shared_Memory/Shared_Memory.mpc
index f0ee256597b..b43422fddfc 100644
--- a/ACE/examples/Shared_Memory/Shared_Memory.mpc
+++ b/ACE/examples/Shared_Memory/Shared_Memory.mpc
@@ -1,15 +1,13 @@
// -*- MPC -*-
// $Id$
-project(*MM) : aceexe {
- avoids += ace_for_tao
+project(*MM) : aceexe, avoids_ace_for_tao {
exename = testmm
Source_Files {
test_MM.cpp
}
}
-project(*SV) : aceexe {
- avoids += ace_for_tao
+project(*SV) : aceexe, avoids_ace_for_tao {
exename = testsv
Source_Files {
test_SV.cpp
diff --git a/ACE/examples/Synch/Synch.mpc b/ACE/examples/Synch/Synch.mpc
index 024e8459803..055d3ff6f07 100644
--- a/ACE/examples/Synch/Synch.mpc
+++ b/ACE/examples/Synch/Synch.mpc
@@ -1,7 +1,6 @@
// -*- MPC -*-
// $Id$
-project : aceexe {
- avoids += ace_for_tao
+project : aceexe, avoids_ace_for_tao {
exename = proc_sema
}
diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc b/ACE/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc
index 62cb7a0a819..05f0c36a9b1 100644
--- a/ACE/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc
+++ b/ACE/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc
@@ -1,29 +1,25 @@
// -*- MPC -*-
// $Id$
-project(*MQ Client) : aceexe {
- avoids += ace_for_tao
+project(*MQ Client) : aceexe, avoids_ace_for_tao {
exename = mqclient
Source_Files {
MQ_Client.cpp
}
}
-project(*MQ Server) : aceexe {
- avoids += ace_for_tao
+project(*MQ Server) : aceexe, avoids_ace_for_tao {
exename = mqserver
Source_Files {
MQ_Server.cpp
}
}
-project(*TMQ Client) : aceexe {
- avoids += ace_for_tao
+project(*TMQ Client) : aceexe, avoids_ace_for_tao {
exename = tmqclient
Source_Files {
TMQ_Client.cpp
}
}
-project(*TMQ Server) : aceexe {
- avoids += ace_for_tao
+project(*TMQ Server) : aceexe, avoids_ace_for_tao {
exename = tmqserver
Source_Files {
TMQ_Server.cpp
diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc b/ACE/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc
index 647e4a4cf5a..a487dae4114 100644
--- a/ACE/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc
+++ b/ACE/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc
@@ -1,15 +1,13 @@
// -*- MPC -*-
// $Id$
-project(*1) : aceexe {
- avoids += ace_for_tao
+project(*1) : aceexe, avoids_ace_for_tao {
exename = sem1
Source_Files {
Semaphores_1.cpp
}
}
-project(*2) : aceexe {
- avoids += ace_for_tao
+project(*2) : aceexe, avoids_ace_for_tao {
exename = sem2
Source_Files {
Semaphores_2.cpp
diff --git a/ACE/examples/Threads/Threads.mpc b/ACE/examples/Threads/Threads.mpc
index 2c57feda243..2c64e03aa7c 100644
--- a/ACE/examples/Threads/Threads.mpc
+++ b/ACE/examples/Threads/Threads.mpc
@@ -25,15 +25,13 @@ project(*cancel) : aceexe {
cancel.cpp
}
}
-project(*future1) : aceexe {
- avoids += ace_for_tao
+project(*future1) : aceexe, avoids_ace_for_tao {
exename = future1
Source_Files {
future1.cpp
}
}
-project(*future2) : aceexe {
- avoids += ace_for_tao
+project(*future2) : aceexe, avoids_ace_for_tao {
exename = future2
Source_Files {
future2.cpp
@@ -45,15 +43,13 @@ project(*manual_event) : aceexe {
manual_event.cpp
}
}
-project(*process_mutex) : aceexe {
- avoids += ace_for_tao
+project(*process_mutex) : aceexe, avoids_ace_for_tao {
exename = process_mutex
Source_Files {
process_mutex.cpp
}
}
-project(*process_semaphore) : aceexe {
- avoids += ace_for_tao
+project(*process_semaphore) : aceexe, avoids_ace_for_tao {
exename = process_semaphore
Source_Files {
process_semaphore.cpp
diff --git a/ACE/examples/Web_Crawler/Web_Crawler.mpc b/ACE/examples/Web_Crawler/Web_Crawler.mpc
index 0a4f3d32685..28621737115 100644
--- a/ACE/examples/Web_Crawler/Web_Crawler.mpc
+++ b/ACE/examples/Web_Crawler/Web_Crawler.mpc
@@ -1,8 +1,7 @@
// -*- MPC -*-
// $Id$
-project : aceexe {
- avoids += ace_for_tao
+project : aceexe, avoids_ace_for_tao {
exename = main
specific(bmake) {
avoids += uses_wchar