diff options
Diffstat (limited to 'ACE')
190 files changed, 684 insertions, 389 deletions
diff --git a/ACE/ACEXML/Makefile.am b/ACE/ACEXML/Makefile.am index f0541d979c7..5e025e19d26 100644 --- a/ACE/ACEXML/Makefile.am +++ b/ACE/ACEXML/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ common \ diff --git a/ACE/ACEXML/apps/Makefile.am b/ACE/ACEXML/apps/Makefile.am index 81f0c9cbd88..7f7bf963687 100644 --- a/ACE/ACEXML/apps/Makefile.am +++ b/ACE/ACEXML/apps/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ svcconf diff --git a/ACE/ACEXML/apps/svcconf/Makefile.am b/ACE/ACEXML/apps/svcconf/Makefile.am index 88cef2d99a5..0a05c085864 100644 --- a/ACE/ACEXML/apps/svcconf/Makefile.am +++ b/ACE/ACEXML/apps/svcconf/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/ACEXML/apps/svcconf diff --git a/ACE/ACEXML/common/Makefile.am b/ACE/ACEXML/common/Makefile.am index d2f2e33a28e..148a0ccffb4 100644 --- a/ACE/ACEXML/common/Makefile.am +++ b/ACE/ACEXML/common/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/ACEXML/common pkgconfigdir = @libdir@/pkgconfig @@ -118,7 +118,7 @@ CLEANFILES = \ ACEXML.pc ACEXML.pc: ${top_builddir}/config.status ${srcdir}/ACEXML.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACEXML.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ACEXML.pc.in endif !BUILD_ACE_FOR_TAO diff --git a/ACE/ACEXML/examples/Makefile.am b/ACE/ACEXML/examples/Makefile.am index 8a2494ea586..0ddb642570a 100644 --- a/ACE/ACEXML/examples/Makefile.am +++ b/ACE/ACEXML/examples/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ SAXPrint diff --git a/ACE/ACEXML/examples/SAXPrint/Makefile.am b/ACE/ACEXML/examples/SAXPrint/Makefile.am index e8098217c3e..8b7853648cf 100644 --- a/ACE/ACEXML/examples/SAXPrint/Makefile.am +++ b/ACE/ACEXML/examples/SAXPrint/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ACEXML/parser/Makefile.am b/ACE/ACEXML/parser/Makefile.am index de38e543937..35c60abcb8d 100644 --- a/ACE/ACEXML/parser/Makefile.am +++ b/ACE/ACEXML/parser/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ parser diff --git a/ACE/ACEXML/parser/parser/Makefile.am b/ACE/ACEXML/parser/parser/Makefile.am index 942e6a22bb4..f4440e30faf 100644 --- a/ACE/ACEXML/parser/parser/Makefile.am +++ b/ACE/ACEXML/parser/parser/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/ACEXML/parser/parser pkgconfigdir = @libdir@/pkgconfig @@ -56,7 +56,7 @@ CLEANFILES = \ ACEXML_Parser.pc ACEXML_Parser.pc: ${top_builddir}/config.status ${srcdir}/ACEXML_Parser.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACEXML_Parser.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ACEXML_Parser.pc.in endif !BUILD_ACE_FOR_TAO diff --git a/ACE/ACEXML/tests/Makefile.am b/ACE/ACEXML/tests/Makefile.am index 926a3fd9212..7fdae59421a 100644 --- a/ACE/ACEXML/tests/Makefile.am +++ b/ACE/ACEXML/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ACEXML/tests/util/Makefile.am b/ACE/ACEXML/tests/util/Makefile.am index 486d37c1902..4de2a3fd78c 100644 --- a/ACE/ACEXML/tests/util/Makefile.am +++ b/ACE/ACEXML/tests/util/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/Makefile.am b/ACE/ASNMP/Makefile.am index fa06f83a3c9..7ff1160c8a3 100644 --- a/ACE/ASNMP/Makefile.am +++ b/ACE/ASNMP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ asnmp \ diff --git a/ACE/ASNMP/agent/Makefile.am b/ACE/ASNMP/agent/Makefile.am index b37fe7aec9e..c19ef46e3ae 100644 --- a/ACE/ASNMP/agent/Makefile.am +++ b/ACE/ASNMP/agent/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/asnmp/Makefile.am b/ACE/ASNMP/asnmp/Makefile.am index 71347a6d858..7b117dab9f6 100644 --- a/ACE/ASNMP/asnmp/Makefile.am +++ b/ACE/ASNMP/asnmp/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/Makefile.am b/ACE/ASNMP/examples/Makefile.am index 1855938d914..ba48f01c667 100644 --- a/ACE/ASNMP/examples/Makefile.am +++ b/ACE/ASNMP/examples/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ get \ diff --git a/ACE/ASNMP/examples/get/Makefile.am b/ACE/ASNMP/examples/get/Makefile.am index c691338b998..ca0673d929d 100644 --- a/ACE/ASNMP/examples/get/Makefile.am +++ b/ACE/ASNMP/examples/get/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/next/Makefile.am b/ACE/ASNMP/examples/next/Makefile.am index dae95eaeaba..72495394d8a 100644 --- a/ACE/ASNMP/examples/next/Makefile.am +++ b/ACE/ASNMP/examples/next/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/set/Makefile.am b/ACE/ASNMP/examples/set/Makefile.am index 7810a658eed..66f049d7f34 100644 --- a/ACE/ASNMP/examples/set/Makefile.am +++ b/ACE/ASNMP/examples/set/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/trap/Makefile.am b/ACE/ASNMP/examples/trap/Makefile.am index 52307634b67..522ef31476c 100644 --- a/ACE/ASNMP/examples/trap/Makefile.am +++ b/ACE/ASNMP/examples/trap/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/walk/Makefile.am b/ACE/ASNMP/examples/walk/Makefile.am index f0bc64a36cf..87205a69c0a 100644 --- a/ACE/ASNMP/examples/walk/Makefile.am +++ b/ACE/ASNMP/examples/walk/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/tests/Makefile.am b/ACE/ASNMP/tests/Makefile.am index 0b9ae3d1ce7..fc8c1f12657 100644 --- a/ACE/ASNMP/tests/Makefile.am +++ b/ACE/ASNMP/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 17ff8decabb..0d9a09d20c5 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,201 @@ +Wed Nov 22 14:10:08 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * examples/ConfigViewer/Makefile.am: + + New file. + + * protocols/tests/RMCast/Makefile.am: + * protocols/tests/Makefile.am: + * protocols/tests/HTBP/Reactor_Tests/Makefile.am: + * protocols/tests/HTBP/Send_Large_Msg/Makefile.am: + * protocols/tests/HTBP/Makefile.am: + * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am: + * protocols/tests/HTBP/ping/Makefile.am: + * protocols/ace/RMCast/Makefile.am: + * protocols/ace/Makefile.am: + * protocols/ace/TMCast/Makefile.am: + * protocols/ace/HTBP/Makefile.am: + * protocols/examples/RMCast/Send_Msg/Makefile.am: + * protocols/examples/RMCast/Makefile.am: + * protocols/examples/Makefile.am: + * protocols/examples/TMCast/Member/Makefile.am: + * protocols/examples/TMCast/Makefile.am: + * ace/Makefile.am: + * ace/SSL/Makefile.am: + * ace/QoS/Makefile.am: + * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am: + * performance-tests/Synch-Benchmarks/Makefile.am: + * performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am: + * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am: + * performance-tests/Server_Concurrency/Leader_Follower/Makefile.am: + * performance-tests/Server_Concurrency/Makefile.am: + * performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am: + * performance-tests/TCP/Makefile.am: + * performance-tests/UDP/Makefile.am: + * performance-tests/SCTP/Makefile.am: + * performance-tests/Makefile.am: + * performance-tests/Misc/Makefile.am: + * Kokyu/tests/FIFO/Makefile.am: + * Kokyu/tests/DSRT_MIF/Makefile.am: + * Kokyu/tests/Makefile.am: + * Kokyu/tests/EDF/Makefile.am: + * Kokyu/Makefile.am: + * tests/SSL/Makefile.am: + * tests/Makefile.am: + * apps/Gateway/Gateway/Makefile.am: + * apps/Gateway/Makefile.am: + * apps/Gateway/Peer/Makefile.am: + * apps/mkcsregdb/Makefile.am: + * apps/drwho/Makefile.am: + * apps/gperf/tests/Makefile.am: + * apps/gperf/src/Makefile.am: + * apps/gperf/Makefile.am: + * apps/JAWS/clients/Blobby/Makefile.am: + * apps/JAWS/clients/Makefile.am: + * apps/JAWS/clients/Caching/Makefile.am: + * apps/JAWS/server/Makefile.am: + * apps/JAWS/Makefile.am: + * apps/JAWS2/JAWS/Makefile.am: + * apps/JAWS2/Makefile.am: + * apps/JAWS3/jaws3/Makefile.am: + * apps/JAWS3/Makefile.am: + * apps/soreduce/Makefile.am: + * bin/Makefile.am: + * ACEXML/tests/Makefile.am: + * ACEXML/tests/util/Makefile.am: + * ACEXML/apps/svcconf/Makefile.am: + * ACEXML/apps/Makefile.am: + * ACEXML/common/Makefile.am: + * ACEXML/Makefile.am: + * ACEXML/parser/Makefile.am: + * ACEXML/parser/parser/Makefile.am: + * ACEXML/examples/SAXPrint/Makefile.am: + * ACEXML/examples/Makefile.am: + * websvcs/tests/Makefile.am: + * websvcs/lib/Makefile.am: + * websvcs/Makefile.am: + * netsvcs/clients/Logger/Makefile.am: + * netsvcs/clients/Tokens/rw_lock/Makefile.am: + * netsvcs/clients/Tokens/mutex/Makefile.am: + * netsvcs/clients/Tokens/deadlock/Makefile.am: + * netsvcs/clients/Tokens/collection/Makefile.am: + * netsvcs/clients/Tokens/invariant/Makefile.am: + * netsvcs/clients/Tokens/manual/Makefile.am: + * netsvcs/clients/Naming/Dump_Restore/Makefile.am: + * netsvcs/clients/Naming/Makefile.am: + * netsvcs/clients/Naming/Client/Makefile.am: + * netsvcs/clients/Makefile.am: + * netsvcs/lib/Makefile.am: + * netsvcs/servers/Makefile.am: + * netsvcs/Makefile.am: + * ASNMP/tests/Makefile.am: + * ASNMP/Makefile.am: + * ASNMP/agent/Makefile.am: + * ASNMP/asnmp/Makefile.am: + * ASNMP/examples/get/Makefile.am: + * ASNMP/examples/trap/Makefile.am: + * ASNMP/examples/Makefile.am: + * ASNMP/examples/set/Makefile.am: + * ASNMP/examples/next/Makefile.am: + * ASNMP/examples/walk/Makefile.am: + * examples/OS/Makefile.am: + * examples/OS/Process/Makefile.am: + * examples/Synch/Makefile.am: + * examples/Timer_Queue/Makefile.am: + * examples/Log_Msg/Makefile.am: + * examples/Misc/Makefile.am: + * examples/ASX/CCM_App/Makefile.am: + * examples/ASX/Event_Server/Transceiver/Makefile.am: + * examples/ASX/Event_Server/Event_Server/Makefile.am: + * examples/ASX/Event_Server/Makefile.am: + * examples/ASX/Message_Queue/Makefile.am: + * examples/ASX/UPIPE_Event_Server/Makefile.am: + * examples/ASX/Makefile.am: + * examples/Web_Crawler/Makefile.am: + * examples/Shared_Malloc/Makefile.am: + * examples/QOS/Change_Sender_TSpec/Makefile.am: + * examples/QOS/Diffserv/Makefile.am: + * examples/QOS/Simple/Makefile.am: + * examples/QOS/Change_Receiver_FlowSpec/Makefile.am: + * examples/Bounded_Packet_Relay/Makefile.am: + * examples/System_V_IPC/SV_Message_Queues/Makefile.am: + * examples/System_V_IPC/Makefile.am: + * examples/System_V_IPC/SV_Semaphores/Makefile.am: + * examples/Map_Manager/Makefile.am: + * examples/APG/Svc_Config/Makefile.am: + * examples/APG/ThreadSafety/Makefile.am: + * examples/APG/ThreadPools/Makefile.am: + * examples/APG/Active_Objects/Makefile.am: + * examples/APG/Logging/Makefile.am: + * examples/APG/Misc_IPC/Makefile.am: + * examples/APG/Proactor/Makefile.am: + * examples/APG/Threads/Makefile.am: + * examples/APG/Shared_Memory/Makefile.am: + * examples/APG/Reactor/Makefile.am: + * examples/APG/Signals/Makefile.am: + * examples/APG/Timers/Makefile.am: + * examples/APG/ThreadManagement/Makefile.am: + * examples/APG/Config/Makefile.am: + * examples/APG/Containers/Makefile.am: + * examples/APG/Processes/Makefile.am: + * examples/APG/Naming/Makefile.am: + * examples/APG/Makefile.am: + * examples/APG/Sockets/Makefile.am: + * examples/APG/Streams/Makefile.am: + * examples/Registry/Makefile.am: + * examples/Smart_Pointers/Makefile.am: + * examples/DLL/Makefile.am: + * examples/IPC_SAP/DEV_SAP/reader/Makefile.am: + * examples/IPC_SAP/DEV_SAP/Makefile.am: + * examples/IPC_SAP/DEV_SAP/writer/Makefile.am: + * examples/IPC_SAP/FILE_SAP/Makefile.am: + * examples/IPC_SAP/SOCK_SAP/Makefile.am: + * examples/IPC_SAP/SPIPE_SAP/Makefile.am: + * examples/IPC_SAP/ATM_SAP/Makefile.am: + * examples/IPC_SAP/SSL_SAP/Makefile.am: + * examples/IPC_SAP/UPIPE_SAP/Makefile.am: + * examples/IPC_SAP/FIFO_SAP/Makefile.am: + * examples/IPC_SAP/Makefile.am: + * examples/IPC_SAP/TLI_SAP/Makefile.am: + * examples/Logger/Acceptor-server/Makefile.am: + * examples/Logger/Makefile.am: + * examples/Logger/simple-server/Makefile.am: + * examples/Logger/client/Makefile.am: + * examples/Export/Makefile.am: + * examples/Service_Configurator/Makefile.am: + * examples/Service_Configurator/IPC-tests/server/Makefile.am: + * examples/Service_Configurator/IPC-tests/Makefile.am: + * examples/Service_Configurator/IPC-tests/client/Makefile.am: + * examples/Service_Configurator/Misc/Makefile.am: + * examples/IOStream/server/Makefile.am: + * examples/IOStream/Makefile.am: + * examples/IOStream/client/Makefile.am: + * examples/Threads/Makefile.am: + * examples/Shared_Memory/Makefile.am: + * examples/Reactor/Ntalker/Makefile.am: + * examples/Reactor/TP_Reactor/Makefile.am: + * examples/Reactor/FIFO/Makefile.am: + * examples/Reactor/Multicast/Makefile.am: + * examples/Reactor/WFMO_Reactor/Makefile.am: + * examples/Reactor/Proactor/Makefile.am: + * examples/Reactor/Makefile.am: + * examples/Reactor/Dgram/Makefile.am: + * examples/Reactor/Misc/Makefile.am: + * examples/Connection/non_blocking/Makefile.am: + * examples/Connection/blocking/Makefile.am: + * examples/Connection/Makefile.am: + * examples/Connection/misc/Makefile.am: + * examples/NT_Service/Makefile.am: + * examples/Naming/Makefile.am: + * examples/Makefile.am: + * examples/Mem_Map/IO-tests/Makefile.am: + * examples/Mem_Map/file-reverse/Makefile.am: + * examples/Mem_Map/Makefile.am: + * examples/C++NPv1/Makefile.am: + * examples/C++NPv2/Makefile.am: + + Regenerated. + Wed Nov 22 13:45:43 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * configure.ac: diff --git a/ACE/Kokyu/Makefile.am b/ACE/Kokyu/Makefile.am index 8a68d21c2eb..86deb01005e 100644 --- a/ACE/Kokyu/Makefile.am +++ b/ACE/Kokyu/Makefile.am @@ -2,6 +2,11 @@ ## ## $Id$ ## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/Kokyu pkgconfigdir = @libdir@/pkgconfig @@ -30,7 +35,7 @@ libKokyu_la_SOURCES = \ Kokyu_defs.cpp libKokyu_la_LDFLAGS = \ - -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ + -release @ACE_VERSION_NAME@ libKokyu_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la @@ -60,7 +65,11 @@ nobase_include_HEADERS = \ Kokyu_dsrt.h \ Kokyu_dsrt.inl -pkgconfig_DATA = Kokyu.pc +pkgconfig_DATA = \ + Kokyu.pc + +CLEANFILES = \ + Kokyu.pc Kokyu.pc: ${top_builddir}/config.status ${srcdir}/Kokyu.pc.in ${top_builddir}/config.status --file $@:${srcdir}/Kokyu.pc.in diff --git a/ACE/Kokyu/tests/DSRT_MIF/Makefile.am b/ACE/Kokyu/tests/DSRT_MIF/Makefile.am index 9e51858b971..4ed16f988cd 100644 --- a/ACE/Kokyu/tests/DSRT_MIF/Makefile.am +++ b/ACE/Kokyu/tests/DSRT_MIF/Makefile.am @@ -6,12 +6,16 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) -## Makefile.DSRT_MIF.am + +## Makefile.DSRT_MIF.am + +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS = MIF MIF_CPPFLAGS = \ @@ -23,8 +27,10 @@ MIF_SOURCES = \ MIF.cpp MIF_LDADD = \ - $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/Kokyu/libKokyu.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_ACE_FOR_TAO ## Clean up template repositories, etc. clean-local: diff --git a/ACE/Kokyu/tests/EDF/Makefile.am b/ACE/Kokyu/tests/EDF/Makefile.am index 22b09e8251a..9aa8fcdf71d 100644 --- a/ACE/Kokyu/tests/EDF/Makefile.am +++ b/ACE/Kokyu/tests/EDF/Makefile.am @@ -6,12 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) -## Makefile.EDF.am +## Makefile.EDF.am + noinst_PROGRAMS = EDF EDF_CPPFLAGS = \ @@ -23,8 +24,8 @@ EDF_SOURCES = \ test.cpp EDF_LDADD = \ - $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/Kokyu/libKokyu.la \ + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/Kokyu/tests/FIFO/Makefile.am b/ACE/Kokyu/tests/FIFO/Makefile.am index 9852af122e0..05b7dbe9e38 100644 --- a/ACE/Kokyu/tests/FIFO/Makefile.am +++ b/ACE/Kokyu/tests/FIFO/Makefile.am @@ -6,12 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) -## Makefile.FIFO.am +## Makefile.FIFO.am + noinst_PROGRAMS = FIFO FIFO_CPPFLAGS = \ @@ -23,8 +24,8 @@ FIFO_SOURCES = \ test.cpp FIFO_LDADD = \ - $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/Kokyu/libKokyu.la \ + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/Kokyu/tests/Makefile.am b/ACE/Kokyu/tests/Makefile.am index 39737061deb..9745459d4e3 100644 --- a/ACE/Kokyu/tests/Makefile.am +++ b/ACE/Kokyu/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ DSRT_MIF \ diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am index 845a3ec75ee..23746d96165 100644 --- a/ACE/ace/Makefile.am +++ b/ACE/ace/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/ace pkgconfigdir = @libdir@/pkgconfig @@ -16,13 +16,11 @@ ACE_ROOT = $(top_srcdir) SUBDIRS = \ . \ - QoS \ SSL CLEANFILES = lib_LTLIBRARIES = pkgconfig_DATA = -nobase_include_HEADERS = ## Makefile.ACE.am @@ -33,8 +31,6 @@ lib_LTLIBRARIES += libACE.la libACE_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - -DACE_HAS_ACE_TOKEN \ - -DACE_HAS_ACE_SVCCONF \ -DACE_BUILD_DLL libACE_la_SOURCES = \ @@ -241,6 +237,7 @@ libACE_la_SOURCES = \ Registry_Name_Space.cpp \ Remote_Name_Space.cpp \ Remote_Tokens.cpp \ + Rtems_init.c \ SOCK.cpp \ SOCK_Acceptor.cpp \ SOCK_CODgram.cpp \ @@ -340,7 +337,7 @@ libACE_la_SOURCES = \ libACE_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ -nobase_include_HEADERS += \ +nobase_include_HEADERS = \ ACE.h \ ACE.inl \ ACE_export.h \ @@ -392,6 +389,7 @@ nobase_include_HEADERS += \ Asynch_Pseudo_Task.h \ Atomic_Op.h \ Atomic_Op.inl \ + Atomic_Op_Sparc.h \ Atomic_Op_T.cpp \ Atomic_Op_T.h \ Atomic_Op_T.inl \ @@ -568,6 +566,9 @@ nobase_include_HEADERS += \ Hash_Map_With_Allocator_T.cpp \ Hash_Map_With_Allocator_T.h \ Hash_Map_With_Allocator_T.inl \ + Hash_Multi_Map_Manager_T.cpp \ + Hash_Multi_Map_Manager_T.h \ + Hash_Multi_Map_Manager_T.inl \ Hashable.h \ Hashable.inl \ High_Res_Timer.h \ @@ -1208,7 +1209,7 @@ CLEANFILES += \ ACE.pc ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in endif !BUILD_ACE_FOR_TAO @@ -1232,7 +1233,7 @@ libACE_FlReactor_la_CPPFLAGS = \ -DACE_FLREACTOR_BUILD_DLL libACE_FlReactor_la_SOURCES = \ - FlReactor.cpp + FlReactor/FlReactor.cpp libACE_FlReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_FLTK_LDFLAGS) @@ -1242,24 +1243,24 @@ libACE_FlReactor_la_LIBADD = \ $(ACE_FLTK_LIBS) nobase_include_HEADERS += \ - ACE_FlReactor_export.h \ - FlReactor.h + FlReactor/ACE_FlReactor_export.h \ + FlReactor/FlReactor.h pkgconfig_DATA += \ - ACE_FlReactor.pc + FlReactor CLEANFILES += \ - ACE_FlReactor.pc + FlReactor -ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_FlReactor.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_FlReactor.pc.in +FlReactor: ${top_builddir}/config.status ${srcdir}/FlReactor + ${top_builddir}/config.status --file $@:${srcdir}/FlReactor endif BUILD_X11 endif BUILD_GL endif BUILD_FL EXTRA_DIST += \ - ACE_FlReactor.pc.in + FlReactor ## Makefile.ACE_QtReactor.am @@ -1267,13 +1268,13 @@ EXTRA_DIST += \ if BUILD_QT BUILT_SOURCES = \ - QtReactor_moc.cpp + QtReactor/QtReactor_moc.cpp CLEANFILES += \ - QtReactor_moc.cpp + QtReactor/QtReactor_moc.cpp -QtReactor_moc.cpp: $(srcdir)/QtReactor.h - $(QTDIR)/bin/moc -o QtReactor_moc.cpp $(srcdir)/QtReactor.h +QtReactor/QtReactor_moc.cpp: $(srcdir)/QtReactor/QtReactor.h + $(QTDIR)/bin/moc $(srcdir)/QtReactor/QtReactor.h -o QtReactor/QtReactor_moc.cpp lib_LTLIBRARIES += libACE_QtReactor.la @@ -1284,8 +1285,8 @@ libACE_QtReactor_la_CPPFLAGS = \ -DACE_QTREACTOR_BUILD_DLL libACE_QtReactor_la_SOURCES = \ - QtReactor.cpp \ - QtReactor_moc.cpp + QtReactor/QtReactor.cpp \ + QtReactor/QtReactor_moc.cpp libACE_QtReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_QT_LDFLAGS) @@ -1295,22 +1296,22 @@ libACE_QtReactor_la_LIBADD = \ $(ACE_QT_LIBS) nobase_include_HEADERS += \ - ACE_QtReactor_export.h \ - QtReactor.h + QtReactor/ACE_QtReactor_export.h \ + QtReactor/QtReactor.h pkgconfig_DATA += \ - ACE_QtReactor.pc + QtReactor CLEANFILES += \ - ACE_QtReactor.pc + QtReactor -ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_QtReactor.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_QtReactor.pc.in +QtReactor: ${top_builddir}/config.status ${srcdir}/QtReactor + ${top_builddir}/config.status --file $@:${srcdir}/QtReactor endif BUILD_QT EXTRA_DIST += \ - ACE_QtReactor.pc.in + QtReactor ## Makefile.ACE_TkReactor.am @@ -1327,7 +1328,7 @@ libACE_TkReactor_la_CPPFLAGS = \ -DACE_TKREACTOR_BUILD_DLL libACE_TkReactor_la_SOURCES = \ - TkReactor.cpp + TkReactor/TkReactor.cpp libACE_TkReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) @@ -1338,22 +1339,22 @@ libACE_TkReactor_la_LIBADD = \ $(ACE_TCL_LIBS) nobase_include_HEADERS += \ - ACE_TkReactor_export.h \ - TkReactor.h + TkReactor/ACE_TkReactor_export.h \ + TkReactor/TkReactor.h pkgconfig_DATA += \ - ACE_TkReactor.pc + TkReactor CLEANFILES += \ - ACE_TkReactor.pc + TkReactor -ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_TkReactor.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_TkReactor.pc.in +TkReactor: ${top_builddir}/config.status ${srcdir}/TkReactor + ${top_builddir}/config.status --file $@:${srcdir}/TkReactor endif BUILD_TK EXTRA_DIST += \ - ACE_TkReactor.pc.in + TkReactor ## Makefile.ACE_XtReactor.am @@ -1371,7 +1372,7 @@ libACE_XtReactor_la_CPPFLAGS = \ -DACE_XTREACTOR_BUILD_DLL libACE_XtReactor_la_SOURCES = \ - XtReactor.cpp + XtReactor/XtReactor.cpp libACE_XtReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) @@ -1382,23 +1383,23 @@ libACE_XtReactor_la_LIBADD = \ $(ACE_X11_LIBS) nobase_include_HEADERS += \ - ACE_XtReactor_export.h \ - XtReactor.h + XtReactor/ACE_XtReactor_export.h \ + XtReactor/XtReactor.h pkgconfig_DATA += \ - ACE_XtReactor.pc + XtReactor CLEANFILES += \ - ACE_XtReactor.pc + XtReactor -ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_XtReactor.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_XtReactor.pc.in +XtReactor: ${top_builddir}/config.status ${srcdir}/XtReactor + ${top_builddir}/config.status --file $@:${srcdir}/XtReactor endif BUILD_XT endif BUILD_X11 EXTRA_DIST += \ - ACE_XtReactor.pc.in + XtReactor ## Clean up template repositories, etc. diff --git a/ACE/ace/QoS/Makefile.am b/ACE/ace/QoS/Makefile.am index 22ff2031cba..5bec2e6562c 100644 --- a/ACE/ace/QoS/Makefile.am +++ b/ACE/ace/QoS/Makefile.am @@ -19,25 +19,25 @@ ACE_ROOT = $(top_srcdir) if BUILD_QOS -lib_LTLIBRARIES = libACE_QoS.la +lib_LTLIBRARIES = $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la -libACE_QoS_la_CPPFLAGS = \ +$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -DACE_QoS_BUILD_DLL -libACE_QoS_la_SOURCES = \ +$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la_SOURCES = \ QoS_Decorator.cpp \ QoS_Manager.cpp \ QoS_Session_Factory.cpp \ QoS_Session_Impl.cpp \ SOCK_Dgram_Mcast_QoS.cpp -libACE_QoS_la_LDFLAGS = \ +$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la_LDFLAGS = \ -release @ACE_VERSION_NAME@ -libACE_QoS_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la +$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la_LIBADD = \ + $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS = \ ACE_QoS_Export.h \ @@ -57,7 +57,7 @@ CLEANFILES = \ ACE_QoS.pc ACE_QoS.pc: ${top_builddir}/config.status ${srcdir}/ACE_QoS.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_QoS.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ACE_QoS.pc.in endif BUILD_QOS diff --git a/ACE/ace/SSL/Makefile.am b/ACE/ace/SSL/Makefile.am index b5ca23f600e..135fa9b937b 100644 --- a/ACE/ace/SSL/Makefile.am +++ b/ACE/ace/SSL/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/ace/SSL pkgconfigdir = @libdir@/pkgconfig @@ -18,6 +18,7 @@ ACE_ROOT = $(top_srcdir) ## Makefile.SSL.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES = libACE_SSL.la @@ -66,8 +67,9 @@ CLEANFILES = \ ACE_SSL.pc ACE_SSL.pc: ${top_builddir}/config.status ${srcdir}/ACE_SSL.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_SSL.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ACE_SSL.pc.in +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL EXTRA_DIST = \ diff --git a/ACE/apps/Gateway/Gateway/Makefile.am b/ACE/apps/Gateway/Gateway/Makefile.am index 83392e20564..ac8ddfab45c 100644 --- a/ACE/apps/Gateway/Gateway/Makefile.am +++ b/ACE/apps/Gateway/Gateway/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/Gateway/Makefile.am b/ACE/apps/Gateway/Makefile.am index ff47f4b6ecd..e0b818fd319 100644 --- a/ACE/apps/Gateway/Makefile.am +++ b/ACE/apps/Gateway/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Gateway \ diff --git a/ACE/apps/Gateway/Peer/Makefile.am b/ACE/apps/Gateway/Peer/Makefile.am index 843f407270a..42504dccb25 100644 --- a/ACE/apps/Gateway/Peer/Makefile.am +++ b/ACE/apps/Gateway/Peer/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/JAWS/Makefile.am b/ACE/apps/JAWS/Makefile.am index 5703744183c..c922c992902 100644 --- a/ACE/apps/JAWS/Makefile.am +++ b/ACE/apps/JAWS/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ clients \ diff --git a/ACE/apps/JAWS/clients/Blobby/Makefile.am b/ACE/apps/JAWS/clients/Blobby/Makefile.am index e3846028703..a8f473c45a9 100644 --- a/ACE/apps/JAWS/clients/Blobby/Makefile.am +++ b/ACE/apps/JAWS/clients/Blobby/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/JAWS/clients/Caching/Makefile.am b/ACE/apps/JAWS/clients/Caching/Makefile.am index ba2cde63635..1e37c329085 100644 --- a/ACE/apps/JAWS/clients/Caching/Makefile.am +++ b/ACE/apps/JAWS/clients/Caching/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,22 +16,23 @@ ACE_ROOT = $(top_srcdir) if BUILD_ACE_FILECACHE if !BUILD_ACE_FOR_TAO -noinst_LTLIBRARIES = libhttp_client.la +noinst_PROGRAMS = http_client -libhttp_client_la_CPPFLAGS = \ +http_client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -libhttp_client_la_SOURCES = \ +http_client_SOURCES = \ http_client.cpp \ - http_handler.cpp - -noinst_HEADERS = \ + http_handler.cpp \ Local_Locator.inl \ Locator_Request_Reply.inl \ URL_Properties.inl \ http_handler.h +http_client_LDADD = \ + $(ACE_BUILDDIR)/ace/libACE.la + endif !BUILD_ACE_FOR_TAO endif BUILD_ACE_FILECACHE diff --git a/ACE/apps/JAWS/clients/Makefile.am b/ACE/apps/JAWS/clients/Makefile.am index 6f338fd5cc8..76571aa387d 100644 --- a/ACE/apps/JAWS/clients/Makefile.am +++ b/ACE/apps/JAWS/clients/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Blobby \ diff --git a/ACE/apps/JAWS/server/Makefile.am b/ACE/apps/JAWS/server/Makefile.am index d13d91ad381..d43dd1206f3 100644 --- a/ACE/apps/JAWS/server/Makefile.am +++ b/ACE/apps/JAWS/server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/JAWS2/JAWS/Makefile.am b/ACE/apps/JAWS2/JAWS/Makefile.am index b201afa54bd..9188abdc618 100644 --- a/ACE/apps/JAWS2/JAWS/Makefile.am +++ b/ACE/apps/JAWS2/JAWS/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libJAWS2.la libJAWS2_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. \ + -I.. \ -DJAWS_BUILD_DLL libJAWS2_la_SOURCES = \ diff --git a/ACE/apps/JAWS2/Makefile.am b/ACE/apps/JAWS2/Makefile.am index 5bc7afdf9fd..b42508c7ba2 100644 --- a/ACE/apps/JAWS2/Makefile.am +++ b/ACE/apps/JAWS2/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ JAWS diff --git a/ACE/apps/JAWS3/Makefile.am b/ACE/apps/JAWS3/Makefile.am index 647eab9416b..84294e864f3 100644 --- a/ACE/apps/JAWS3/Makefile.am +++ b/ACE/apps/JAWS3/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ jaws3 diff --git a/ACE/apps/JAWS3/jaws3/Makefile.am b/ACE/apps/JAWS3/jaws3/Makefile.am index 549790b885c..185468cf9e3 100644 --- a/ACE/apps/JAWS3/jaws3/Makefile.am +++ b/ACE/apps/JAWS3/jaws3/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libJAWS3.la libJAWS3_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. \ + -I.. \ -DJAWS_BUILD_DLL libJAWS3_la_SOURCES = \ @@ -90,7 +90,7 @@ noinst_PROGRAMS = main main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. + -I.. main_SOURCES = \ main.cpp \ diff --git a/ACE/apps/drwho/Makefile.am b/ACE/apps/drwho/Makefile.am index 8a6e815e167..7cf39818868 100644 --- a/ACE/apps/drwho/Makefile.am +++ b/ACE/apps/drwho/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/gperf/Makefile.am b/ACE/apps/gperf/Makefile.am index a6030210b21..b8cdd293211 100644 --- a/ACE/apps/gperf/Makefile.am +++ b/ACE/apps/gperf/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ diff --git a/ACE/apps/gperf/src/Makefile.am b/ACE/apps/gperf/src/Makefile.am index 623c9054179..99de5128122 100644 --- a/ACE/apps/gperf/src/Makefile.am +++ b/ACE/apps/gperf/src/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/gperf/tests/Makefile.am b/ACE/apps/gperf/tests/Makefile.am index 2a5fb70ce2f..763debfda15 100644 --- a/ACE/apps/gperf/tests/Makefile.am +++ b/ACE/apps/gperf/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,7 @@ CLEANFILES = BUILT_SOURCES = noinst_PROGRAMS = -## Makefile.adainset.am +## Makefile.adainset.am if !BUILD_USES_WCHAR @@ -23,14 +23,10 @@ BUILT_SOURCES += \ ada.cpp CLEANFILES += \ - ada.cpp \ - ada-stamp - -ada.cpp: ada-stamp + ada.cpp -ada-stamp: $(srcdir)/ada.gperf - ../src/gperf -a -k1,4,$$ $(srcdir)/ada.gperf > ada.cpp - @touch $@ +ada.cpp: $(srcdir)/ada.gperf + $(ACE_ROOT)/bin/gperf -a -k1,4,$$ $(srcdir)/ada.gperf > ada.cpp noinst_PROGRAMS += aout @@ -47,7 +43,7 @@ aout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.cinset.am +## Makefile.cinset.am if !BUILD_USES_WCHAR @@ -55,14 +51,10 @@ BUILT_SOURCES += \ c.cpp CLEANFILES += \ - c.cpp \ - c-stamp - -c.cpp: c-stamp + c.cpp -c-stamp: $(srcdir)/c.gperf - ../src/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf > c.cpp - @touch $@ +c.cpp: $(srcdir)/c.gperf + $(ACE_ROOT)/bin/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf > c.cpp noinst_PROGRAMS += cout @@ -79,7 +71,7 @@ cout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.cppinset.am +## Makefile.cppinset.am if !BUILD_USES_WCHAR @@ -87,14 +79,10 @@ BUILT_SOURCES += \ cpp.cpp CLEANFILES += \ - cpp.cpp \ - cpp-stamp - -cpp.cpp: cpp-stamp + cpp.cpp -cpp-stamp: $(srcdir)/cpp.gperf - ../src/gperf -a -D $(srcdir)/cpp.gperf > cpp.cpp - @touch $@ +cpp.cpp: $(srcdir)/cpp.gperf + $(ACE_ROOT)/bin/gperf -a -D $(srcdir)/cpp.gperf > cpp.cpp noinst_PROGRAMS += cppout @@ -111,7 +99,7 @@ cppout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.iinset.am +## Makefile.iinset.am if !BUILD_USES_WCHAR @@ -119,14 +107,10 @@ BUILT_SOURCES += \ idl.cpp CLEANFILES += \ - idl.cpp \ - idl-stamp - -idl.cpp: idl-stamp + idl.cpp -idl-stamp: $(srcdir)/idl.gperf - ../src/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf > idl.cpp - @touch $@ +idl.cpp: $(srcdir)/idl.gperf + $(ACE_ROOT)/bin/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf > idl.cpp noinst_PROGRAMS += iout @@ -143,7 +127,7 @@ iout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.iinset2.am +## Makefile.iinset2.am if !BUILD_USES_WCHAR @@ -151,15 +135,11 @@ BUILT_SOURCES += \ iout2_gen/idl.cpp CLEANFILES += \ - iout2_gen/idl.cpp \ - iout2_gen/idl-stamp - -iout2_gen/idl.cpp: iout2_gen/idl-stamp + iout2_gen/idl.cpp -iout2_gen/idl-stamp: $(srcdir)/idl.gperf +iout2_gen/idl.cpp: $(srcdir)/idl.gperf mkdir -p iout2_gen - ../src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf > iout2_gen/idl.cpp - @touch $@ + $(ACE_ROOT)/bin/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf > iout2_gen/idl.cpp noinst_PROGRAMS += iout2 @@ -176,7 +156,7 @@ iout2_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.m3inset.am +## Makefile.m3inset.am if !BUILD_USES_WCHAR @@ -184,14 +164,10 @@ BUILT_SOURCES += \ modula3.cpp CLEANFILES += \ - modula3.cpp \ - modula3-stamp - -modula3.cpp: modula3-stamp + modula3.cpp -modula3-stamp: $(srcdir)/modula3.gperf - ../src/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf > modula3.cpp - @touch $@ +modula3.cpp: $(srcdir)/modula3.gperf + $(ACE_ROOT)/bin/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf > modula3.cpp noinst_PROGRAMS += m3out @@ -208,7 +184,7 @@ m3out_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.pinset.am +## Makefile.pinset.am if !BUILD_USES_WCHAR @@ -216,14 +192,10 @@ BUILT_SOURCES += \ pascal.cpp CLEANFILES += \ - pascal.cpp \ - pascal-stamp - -pascal.cpp: pascal-stamp + pascal.cpp -pascal-stamp: $(srcdir)/pascal.gperf - ../src/gperf -a -o -S2 -p $(srcdir)/pascal.gperf > pascal.cpp - @touch $@ +pascal.cpp: $(srcdir)/pascal.gperf + $(ACE_ROOT)/bin/gperf -a -o -S2 -p $(srcdir)/pascal.gperf > pascal.cpp noinst_PROGRAMS += pout @@ -240,7 +212,7 @@ pout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.preinset.am +## Makefile.preinset.am if !BUILD_USES_WCHAR @@ -248,14 +220,10 @@ BUILT_SOURCES += \ adadefs.cpp CLEANFILES += \ - adadefs.cpp \ - adadefs-stamp - -adadefs.cpp: adadefs-stamp + adadefs.cpp -adadefs-stamp: $(srcdir)/adadefs.gperf - ../src/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf > adadefs.cpp - @touch $@ +adadefs.cpp: $(srcdir)/adadefs.gperf + $(ACE_ROOT)/bin/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf > adadefs.cpp noinst_PROGRAMS += preout @@ -272,7 +240,7 @@ preout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.taoinset.am +## Makefile.taoinset.am if !BUILD_USES_WCHAR @@ -280,14 +248,10 @@ BUILT_SOURCES += \ tao.cpp CLEANFILES += \ - tao.cpp \ - tao-stamp - -tao.cpp: tao-stamp + tao.cpp -tao-stamp: $(srcdir)/tao.gperf - ../src/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf > tao.cpp - @touch $@ +tao.cpp: $(srcdir)/tao.gperf + $(ACE_ROOT)/bin/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf > tao.cpp noinst_PROGRAMS += taoout @@ -304,7 +268,7 @@ taoout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.tinset.am +## Makefile.tinset.am if !BUILD_USES_WCHAR @@ -312,14 +276,10 @@ BUILT_SOURCES += \ corba.cpp CLEANFILES += \ - corba.cpp \ - corba-stamp - -corba.cpp: corba-stamp + corba.cpp -corba-stamp: $(srcdir)/corba.gperf - ../src/gperf -a -o $(srcdir)/corba.gperf > corba.cpp - @touch $@ +corba.cpp: $(srcdir)/corba.gperf + $(ACE_ROOT)/bin/gperf -a -o $(srcdir)/corba.gperf > corba.cpp noinst_PROGRAMS += tout diff --git a/ACE/apps/mkcsregdb/Makefile.am b/ACE/apps/mkcsregdb/Makefile.am index a08f795e30a..b90caa15e4a 100644 --- a/ACE/apps/mkcsregdb/Makefile.am +++ b/ACE/apps/mkcsregdb/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/soreduce/Makefile.am b/ACE/apps/soreduce/Makefile.am index 4f50d294e0d..732dec5e383 100644 --- a/ACE/apps/soreduce/Makefile.am +++ b/ACE/apps/soreduce/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/bin/Makefile.am b/ACE/bin/Makefile.am index 996040dd287..bc5c70469dc 100644 --- a/ACE/bin/Makefile.am +++ b/ACE/bin/Makefile.am @@ -29,7 +29,7 @@ envinfo_SOURCES = \ envinfo.cpp envinfo_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/examples/APG/Active_Objects/Makefile.am b/ACE/examples/APG/Active_Objects/Makefile.am index 4562743bc87..5c0c5161247 100644 --- a/ACE/examples/APG/Active_Objects/Makefile.am +++ b/ACE/examples/APG/Active_Objects/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Config/Makefile.am b/ACE/examples/APG/Config/Makefile.am index 5320bfdf85c..a0e289fdf8d 100644 --- a/ACE/examples/APG/Config/Makefile.am +++ b/ACE/examples/APG/Config/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Containers/Makefile.am b/ACE/examples/APG/Containers/Makefile.am index e5ef96ad6dc..b098b92d55a 100644 --- a/ACE/examples/APG/Containers/Makefile.am +++ b/ACE/examples/APG/Containers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Logging/Makefile.am b/ACE/examples/APG/Logging/Makefile.am index 69564edb197..56201a69ba6 100644 --- a/ACE/examples/APG/Logging/Makefile.am +++ b/ACE/examples/APG/Logging/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Makefile.am b/ACE/examples/APG/Makefile.am index f79765c9348..5a191de8a82 100644 --- a/ACE/examples/APG/Makefile.am +++ b/ACE/examples/APG/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Active_Objects \ diff --git a/ACE/examples/APG/Misc_IPC/Makefile.am b/ACE/examples/APG/Misc_IPC/Makefile.am index 656f63fb00c..844496c1c0a 100644 --- a/ACE/examples/APG/Misc_IPC/Makefile.am +++ b/ACE/examples/APG/Misc_IPC/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Naming/Makefile.am b/ACE/examples/APG/Naming/Makefile.am index f73b1258348..8614b352655 100644 --- a/ACE/examples/APG/Naming/Makefile.am +++ b/ACE/examples/APG/Naming/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Proactor/Makefile.am b/ACE/examples/APG/Proactor/Makefile.am index a7632af1d4f..644145b9ebc 100644 --- a/ACE/examples/APG/Proactor/Makefile.am +++ b/ACE/examples/APG/Proactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Processes/Makefile.am b/ACE/examples/APG/Processes/Makefile.am index 5c45a506304..99ad3796b24 100644 --- a/ACE/examples/APG/Processes/Makefile.am +++ b/ACE/examples/APG/Processes/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Reactor/Makefile.am b/ACE/examples/APG/Reactor/Makefile.am index 789c0ce7785..12b7d7ed68f 100644 --- a/ACE/examples/APG/Reactor/Makefile.am +++ b/ACE/examples/APG/Reactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Shared_Memory/Makefile.am b/ACE/examples/APG/Shared_Memory/Makefile.am index b114eb0153a..cf0b1907879 100644 --- a/ACE/examples/APG/Shared_Memory/Makefile.am +++ b/ACE/examples/APG/Shared_Memory/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Signals/Makefile.am b/ACE/examples/APG/Signals/Makefile.am index ffc67bdd0f0..2e11d4953bc 100644 --- a/ACE/examples/APG/Signals/Makefile.am +++ b/ACE/examples/APG/Signals/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Sockets/Makefile.am b/ACE/examples/APG/Sockets/Makefile.am index 3409703f567..90ae3ae3411 100644 --- a/ACE/examples/APG/Sockets/Makefile.am +++ b/ACE/examples/APG/Sockets/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Streams/Makefile.am b/ACE/examples/APG/Streams/Makefile.am index e23f2f22143..11c997ab542 100644 --- a/ACE/examples/APG/Streams/Makefile.am +++ b/ACE/examples/APG/Streams/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Svc_Config/Makefile.am b/ACE/examples/APG/Svc_Config/Makefile.am index 9fa3e2f18b6..db90efea3be 100644 --- a/ACE/examples/APG/Svc_Config/Makefile.am +++ b/ACE/examples/APG/Svc_Config/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/ThreadManagement/Makefile.am b/ACE/examples/APG/ThreadManagement/Makefile.am index 0ed91996db2..1a28c357c55 100644 --- a/ACE/examples/APG/ThreadManagement/Makefile.am +++ b/ACE/examples/APG/ThreadManagement/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/ThreadPools/Makefile.am b/ACE/examples/APG/ThreadPools/Makefile.am index f1167e857c5..4ed1843460c 100644 --- a/ACE/examples/APG/ThreadPools/Makefile.am +++ b/ACE/examples/APG/ThreadPools/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/ThreadSafety/Makefile.am b/ACE/examples/APG/ThreadSafety/Makefile.am index e7c52980171..9d5816f68ff 100644 --- a/ACE/examples/APG/ThreadSafety/Makefile.am +++ b/ACE/examples/APG/ThreadSafety/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Threads/Makefile.am b/ACE/examples/APG/Threads/Makefile.am index a5a1b77d76a..a9fad02971b 100644 --- a/ACE/examples/APG/Threads/Makefile.am +++ b/ACE/examples/APG/Threads/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Timers/Makefile.am b/ACE/examples/APG/Timers/Makefile.am index 33976800fec..69277afec6e 100644 --- a/ACE/examples/APG/Timers/Makefile.am +++ b/ACE/examples/APG/Timers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/ASX/CCM_App/Makefile.am b/ACE/examples/ASX/CCM_App/Makefile.am index e4051c952ad..c02f0a5e29f 100644 --- a/ACE/examples/ASX/CCM_App/Makefile.am +++ b/ACE/examples/ASX/CCM_App/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am b/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am index 1664c15834f..6a04bb26c4e 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am +++ b/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/ASX/Event_Server/Makefile.am b/ACE/examples/ASX/Event_Server/Makefile.am index b337a11860a..f00f4c3dd09 100644 --- a/ACE/examples/ASX/Event_Server/Makefile.am +++ b/ACE/examples/ASX/Event_Server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Event_Server \ diff --git a/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am b/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am index 9407ab5873b..56c1a1eafed 100644 --- a/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am +++ b/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/ASX/Makefile.am b/ACE/examples/ASX/Makefile.am index ecfcb575851..22df464dcfc 100644 --- a/ACE/examples/ASX/Makefile.am +++ b/ACE/examples/ASX/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ CCM_App \ diff --git a/ACE/examples/ASX/Message_Queue/Makefile.am b/ACE/examples/ASX/Message_Queue/Makefile.am index 67e75b6c241..2bf910700f8 100644 --- a/ACE/examples/ASX/Message_Queue/Makefile.am +++ b/ACE/examples/ASX/Message_Queue/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am b/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am index 094c82c0f1b..f0aca33aa4b 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am +++ b/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Bounded_Packet_Relay/Makefile.am b/ACE/examples/Bounded_Packet_Relay/Makefile.am index 5fb14ba2d05..8751a3e3c02 100644 --- a/ACE/examples/Bounded_Packet_Relay/Makefile.am +++ b/ACE/examples/Bounded_Packet_Relay/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/C++NPv1/Makefile.am b/ACE/examples/C++NPv1/Makefile.am index 5c46ae7f00d..5da306a48dc 100644 --- a/ACE/examples/C++NPv1/Makefile.am +++ b/ACE/examples/C++NPv1/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/C++NPv2/Makefile.am b/ACE/examples/C++NPv2/Makefile.am index e15da126644..f3618a5940c 100644 --- a/ACE/examples/C++NPv2/Makefile.am +++ b/ACE/examples/C++NPv2/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -18,7 +18,7 @@ noinst_PROGRAMS = ## Makefile.C++NPv2_AC_CLD.am if BUILD_SSL -if !BUILD_ACE_FOR_TAO +if BUILD_THREADS if !BUILD_USES_WCHAR noinst_LTLIBRARIES += libAC_CLD.la @@ -43,13 +43,12 @@ noinst_HEADERS += \ Reactor_Logging_Server_T.cpp endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO +endif BUILD_THREADS endif BUILD_SSL ## Makefile.C++NPv2_AIO_CLD.am if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES += libAIO_CLD.la @@ -70,7 +69,6 @@ noinst_HEADERS += \ AIO_Client_Logging_Daemon.h \ Reactor_Logging_Server_T.cpp -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.C++NPv2_CLD.am @@ -303,7 +301,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.C++NPv2_TPCLS.am if BUILD_SSL -if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR noinst_LTLIBRARIES += libTPCLS.la @@ -328,7 +325,6 @@ noinst_HEADERS += \ TPC_Logging_Server.h endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.C++NPv2_TPLS.am diff --git a/ACE/examples/Connection/Makefile.am b/ACE/examples/Connection/Makefile.am index 8aa21d598ff..36a9cc8383a 100644 --- a/ACE/examples/Connection/Makefile.am +++ b/ACE/examples/Connection/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ blocking \ diff --git a/ACE/examples/Connection/blocking/Makefile.am b/ACE/examples/Connection/blocking/Makefile.am index a12eab920b8..65247fcdb81 100644 --- a/ACE/examples/Connection/blocking/Makefile.am +++ b/ACE/examples/Connection/blocking/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Connection/misc/Makefile.am b/ACE/examples/Connection/misc/Makefile.am index ce3790d2851..21cf30da4d7 100644 --- a/ACE/examples/Connection/misc/Makefile.am +++ b/ACE/examples/Connection/misc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Connection/non_blocking/Makefile.am b/ACE/examples/Connection/non_blocking/Makefile.am index 8395e3a9fbb..e5653968d98 100644 --- a/ACE/examples/Connection/non_blocking/Makefile.am +++ b/ACE/examples/Connection/non_blocking/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/DLL/Makefile.am b/ACE/examples/DLL/Makefile.am index 4973af35bf9..b2e4825bcef 100644 --- a/ACE/examples/DLL/Makefile.am +++ b/ACE/examples/DLL/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Export/Makefile.am b/ACE/examples/Export/Makefile.am index 74baf4baf66..ed6989d5be1 100644 --- a/ACE/examples/Export/Makefile.am +++ b/ACE/examples/Export/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IOStream/Makefile.am b/ACE/examples/IOStream/Makefile.am index 0a99932ce34..3ad9fe59404 100644 --- a/ACE/examples/IOStream/Makefile.am +++ b/ACE/examples/IOStream/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ client \ diff --git a/ACE/examples/IOStream/client/Makefile.am b/ACE/examples/IOStream/client/Makefile.am index e1225bbb6d5..0f6d5c219fd 100644 --- a/ACE/examples/IOStream/client/Makefile.am +++ b/ACE/examples/IOStream/client/Makefile.am @@ -6,21 +6,24 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.IOStream_Client.am -noinst_LTLIBRARIES = libIOStream_Client.la +noinst_PROGRAMS = iostream_client -libIOStream_Client_la_CPPFLAGS = \ +iostream_client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -libIOStream_Client_la_SOURCES = \ +iostream_client_SOURCES = \ iostream_client.cpp +iostream_client_LDADD = \ + $(ACE_BUILDDIR)/ace/libACE.la + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/ACE/examples/IOStream/server/Makefile.am b/ACE/examples/IOStream/server/Makefile.am index 8b72a1adb62..fdf8aedaf6d 100644 --- a/ACE/examples/IOStream/server/Makefile.am +++ b/ACE/examples/IOStream/server/Makefile.am @@ -6,24 +6,25 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.IOStream_Server.am -noinst_LTLIBRARIES = libIOStream_Server.la +noinst_PROGRAMS = iostream_server -libIOStream_Server_la_CPPFLAGS = \ +iostream_server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -libIOStream_Server_la_SOURCES = \ - iostream_server.cpp - -noinst_HEADERS = \ +iostream_server_SOURCES = \ + iostream_server.cpp \ iostream_server.h +iostream_server_LDADD = \ + $(ACE_BUILDDIR)/ace/libACE.la + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am b/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am index e3ee4011b05..b545d97b598 100644 --- a/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am index bb95a489da6..ecc65507d22 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ reader \ diff --git a/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am index bff70f43cd3..8e1cf6f70af 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am +++ b/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am index 613a8d08102..f718cc5a379 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am +++ b/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am b/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am index 9a9cba4b837..d24d899508b 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am b/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am index e39aa964edf..14fef21b703 100644 --- a/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/Makefile.am b/ACE/examples/IPC_SAP/Makefile.am index 87f2a00844b..31c046f885a 100644 --- a/ACE/examples/IPC_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ ATM_SAP \ diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am b/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am index 50260dc7343..0cac261a76c 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am b/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am index 662c99fc452..ddfd39b2aab 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am b/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am index 3df4d11db5b..5a0e4bc3dfb 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am b/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am index 80b48222d22..1e93d808e32 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am b/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am index 60054e3c7c0..3873d2397aa 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Log_Msg/Makefile.am b/ACE/examples/Log_Msg/Makefile.am index c5d038d332d..9621e005318 100644 --- a/ACE/examples/Log_Msg/Makefile.am +++ b/ACE/examples/Log_Msg/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Logger/Acceptor-server/Makefile.am b/ACE/examples/Logger/Acceptor-server/Makefile.am index bf1824c86d3..bc28535f3b9 100644 --- a/ACE/examples/Logger/Acceptor-server/Makefile.am +++ b/ACE/examples/Logger/Acceptor-server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Logger/Makefile.am b/ACE/examples/Logger/Makefile.am index 3aa67282ba4..29e3225dcbe 100644 --- a/ACE/examples/Logger/Makefile.am +++ b/ACE/examples/Logger/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Acceptor-server \ diff --git a/ACE/examples/Logger/client/Makefile.am b/ACE/examples/Logger/client/Makefile.am index d38d5699588..5254ec79076 100644 --- a/ACE/examples/Logger/client/Makefile.am +++ b/ACE/examples/Logger/client/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Logger/simple-server/Makefile.am b/ACE/examples/Logger/simple-server/Makefile.am index a018d587b98..05ce9326c65 100644 --- a/ACE/examples/Logger/simple-server/Makefile.am +++ b/ACE/examples/Logger/simple-server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Makefile.am b/ACE/examples/Makefile.am index 1e8ba6f626f..9582b2deca2 100644 --- a/ACE/examples/Makefile.am +++ b/ACE/examples/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ APG \ @@ -14,6 +14,7 @@ SUBDIRS = \ Bounded_Packet_Relay \ C++NPv1 \ C++NPv2 \ + ConfigViewer \ Connection \ DLL \ Export \ @@ -27,7 +28,6 @@ SUBDIRS = \ NT_Service \ Naming \ OS \ - QOS \ Reactor \ Registry \ Service_Configurator \ @@ -36,7 +36,6 @@ SUBDIRS = \ Smart_Pointers \ Synch \ System_V_IPC \ - TMCast \ Threads \ Timer_Queue \ Web_Crawler diff --git a/ACE/examples/Map_Manager/Makefile.am b/ACE/examples/Map_Manager/Makefile.am index d5f39e68514..d6d74f539a4 100644 --- a/ACE/examples/Map_Manager/Makefile.am +++ b/ACE/examples/Map_Manager/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Mem_Map/IO-tests/Makefile.am b/ACE/examples/Mem_Map/IO-tests/Makefile.am index 9a6e3638c29..d0a440481cb 100644 --- a/ACE/examples/Mem_Map/IO-tests/Makefile.am +++ b/ACE/examples/Mem_Map/IO-tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Mem_Map/Makefile.am b/ACE/examples/Mem_Map/Makefile.am index 9d8830d2147..4dec1a54c74 100644 --- a/ACE/examples/Mem_Map/Makefile.am +++ b/ACE/examples/Mem_Map/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ IO-tests \ diff --git a/ACE/examples/Mem_Map/file-reverse/Makefile.am b/ACE/examples/Mem_Map/file-reverse/Makefile.am index 02a081a6c88..9dee643d8b2 100644 --- a/ACE/examples/Mem_Map/file-reverse/Makefile.am +++ b/ACE/examples/Mem_Map/file-reverse/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Misc/Makefile.am b/ACE/examples/Misc/Makefile.am index 8bb0b8dc8d8..905f4be7e5f 100644 --- a/ACE/examples/Misc/Makefile.am +++ b/ACE/examples/Misc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -100,6 +100,20 @@ test_sstring_SOURCES = \ test_sstring_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la +## Makefile.Misc_Test_Timestamp.am +noinst_PROGRAMS += test_timestamp + +test_timestamp_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) + +test_timestamp_SOURCES = \ + test_timestamp.cpp \ + test_dump.h + +test_timestamp_LDADD = \ + $(ACE_BUILDDIR)/ace/libACE.la + ## Makefile.Misc_Test_Trace.am noinst_PROGRAMS += test_trace diff --git a/ACE/examples/NT_Service/Makefile.am b/ACE/examples/NT_Service/Makefile.am index fbc93c45f6d..33899b5733e 100644 --- a/ACE/examples/NT_Service/Makefile.am +++ b/ACE/examples/NT_Service/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Naming/Makefile.am b/ACE/examples/Naming/Makefile.am index de8e2353f18..7870f67da3a 100644 --- a/ACE/examples/Naming/Makefile.am +++ b/ACE/examples/Naming/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/OS/Makefile.am b/ACE/examples/OS/Makefile.am index 73458dccc45..7547a62a438 100644 --- a/ACE/examples/OS/Makefile.am +++ b/ACE/examples/OS/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Process diff --git a/ACE/examples/OS/Process/Makefile.am b/ACE/examples/OS/Process/Makefile.am index 88eac9e35bd..a1947207928 100644 --- a/ACE/examples/OS/Process/Makefile.am +++ b/ACE/examples/OS/Process/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am b/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am index c4d51897787..18d655299e0 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am @@ -35,8 +35,8 @@ receiver_SOURCES = \ Receiver_QoS_Event_Handler.h receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS @@ -62,8 +62,8 @@ sender_SOURCES = \ Sender_QoS_Event_Handler.h sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am b/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am index 980d5cf3422..2968f73620a 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am +++ b/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am @@ -35,8 +35,8 @@ receiver_SOURCES = \ Receiver_QoS_Event_Handler.h receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS @@ -62,8 +62,8 @@ sender_SOURCES = \ Sender_QoS_Event_Handler.h sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/QOS/Diffserv/Makefile.am b/ACE/examples/QOS/Diffserv/Makefile.am index e94221278a2..ae36afe7032 100644 --- a/ACE/examples/QOS/Diffserv/Makefile.am +++ b/ACE/examples/QOS/Diffserv/Makefile.am @@ -28,8 +28,8 @@ client_SOURCES = \ diffserv_test.cpp client_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO endif BUILD_QOS @@ -48,8 +48,8 @@ server_SOURCES = \ server.cpp server_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/QOS/Simple/Makefile.am b/ACE/examples/QOS/Simple/Makefile.am index d86d7cd43eb..2bda6a145a3 100644 --- a/ACE/examples/QOS/Simple/Makefile.am +++ b/ACE/examples/QOS/Simple/Makefile.am @@ -35,8 +35,8 @@ receiver_SOURCES = \ Receiver_QoS_Event_Handler.h receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS @@ -62,8 +62,8 @@ sender_SOURCES = \ Sender_QoS_Event_Handler.h sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/Reactor/Dgram/Makefile.am b/ACE/examples/Reactor/Dgram/Makefile.am index 797f4b3d75e..260b5fb4a4c 100644 --- a/ACE/examples/Reactor/Dgram/Makefile.am +++ b/ACE/examples/Reactor/Dgram/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/FIFO/Makefile.am b/ACE/examples/Reactor/FIFO/Makefile.am index 5540e860968..664952a1e5c 100644 --- a/ACE/examples/Reactor/FIFO/Makefile.am +++ b/ACE/examples/Reactor/FIFO/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/Makefile.am b/ACE/examples/Reactor/Makefile.am index 24d9217302d..aced36e2c87 100644 --- a/ACE/examples/Reactor/Makefile.am +++ b/ACE/examples/Reactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Dgram \ diff --git a/ACE/examples/Reactor/Misc/Makefile.am b/ACE/examples/Reactor/Misc/Makefile.am index 47111585f87..32b7a7ef89a 100644 --- a/ACE/examples/Reactor/Misc/Makefile.am +++ b/ACE/examples/Reactor/Misc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/Multicast/Makefile.am b/ACE/examples/Reactor/Multicast/Makefile.am index 60d65e7ebe8..37f6436bcc1 100644 --- a/ACE/examples/Reactor/Multicast/Makefile.am +++ b/ACE/examples/Reactor/Multicast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/Ntalker/Makefile.am b/ACE/examples/Reactor/Ntalker/Makefile.am index 6efc3521a32..162cf34a4d8 100644 --- a/ACE/examples/Reactor/Ntalker/Makefile.am +++ b/ACE/examples/Reactor/Ntalker/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/Proactor/Makefile.am b/ACE/examples/Reactor/Proactor/Makefile.am index 7f1bc4b8a57..299e2641042 100644 --- a/ACE/examples/Reactor/Proactor/Makefile.am +++ b/ACE/examples/Reactor/Proactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/TP_Reactor/Makefile.am b/ACE/examples/Reactor/TP_Reactor/Makefile.am index 5407cbb10e1..755a91b9624 100644 --- a/ACE/examples/Reactor/TP_Reactor/Makefile.am +++ b/ACE/examples/Reactor/TP_Reactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/WFMO_Reactor/Makefile.am b/ACE/examples/Reactor/WFMO_Reactor/Makefile.am index cfa1c687b6c..f77fb8f3164 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Makefile.am +++ b/ACE/examples/Reactor/WFMO_Reactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Registry/Makefile.am b/ACE/examples/Registry/Makefile.am index 1e02e33abb2..fc72c526226 100644 --- a/ACE/examples/Registry/Makefile.am +++ b/ACE/examples/Registry/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Service_Configurator/IPC-tests/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/Makefile.am index 0a99932ce34..3ad9fe59404 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/Makefile.am +++ b/ACE/examples/Service_Configurator/IPC-tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ client \ diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am index b6dd5a3d7b8..440e67db7b4 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am +++ b/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am index 954697dfba3..26192c73f1b 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Service_Configurator/Makefile.am b/ACE/examples/Service_Configurator/Makefile.am index 1b78bb27757..8a3ecc74489 100644 --- a/ACE/examples/Service_Configurator/Makefile.am +++ b/ACE/examples/Service_Configurator/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ IPC-tests \ diff --git a/ACE/examples/Service_Configurator/Misc/Makefile.am b/ACE/examples/Service_Configurator/Misc/Makefile.am index f0de4232add..29a625cf764 100644 --- a/ACE/examples/Service_Configurator/Misc/Makefile.am +++ b/ACE/examples/Service_Configurator/Misc/Makefile.am @@ -6,21 +6,21 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Service_Configurator_Misc_Timer.am -noinst_LTLIBRARIES = libtimer.la +noinst_LTLIBRARIES = libTimer.la -libtimer_la_CPPFLAGS = \ +libTimer_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -DACE_BUILD_SVC_DLL -libtimer_la_SOURCES = \ +libTimer_la_SOURCES = \ Timer_Service.cpp noinst_HEADERS = \ @@ -38,7 +38,7 @@ main_SOURCES = \ Timer_Service.h main_LDADD = \ - libtimer.la \ + libTimer.la \ $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. diff --git a/ACE/examples/Shared_Malloc/Makefile.am b/ACE/examples/Shared_Malloc/Makefile.am index baccb0359e0..99ff0b3ab9a 100644 --- a/ACE/examples/Shared_Malloc/Makefile.am +++ b/ACE/examples/Shared_Malloc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Shared_Memory/Makefile.am b/ACE/examples/Shared_Memory/Makefile.am index 864c7a5b071..8b11509cc63 100644 --- a/ACE/examples/Shared_Memory/Makefile.am +++ b/ACE/examples/Shared_Memory/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Smart_Pointers/Makefile.am b/ACE/examples/Smart_Pointers/Makefile.am index 4595d7dafaa..f4a565a22d6 100644 --- a/ACE/examples/Smart_Pointers/Makefile.am +++ b/ACE/examples/Smart_Pointers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Synch/Makefile.am b/ACE/examples/Synch/Makefile.am index 09319f393b3..32db117ef20 100644 --- a/ACE/examples/Synch/Makefile.am +++ b/ACE/examples/Synch/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/System_V_IPC/Makefile.am b/ACE/examples/System_V_IPC/Makefile.am index 23b52ee8b29..a505dc9b737 100644 --- a/ACE/examples/System_V_IPC/Makefile.am +++ b/ACE/examples/System_V_IPC/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ SV_Message_Queues \ diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am b/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am index eadb6b8df53..6689900c0fe 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am b/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am index de9a88952a6..26f0d5d5642 100644 --- a/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am +++ b/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Threads/Makefile.am b/ACE/examples/Threads/Makefile.am index edd80b72542..f7e3bb56415 100644 --- a/ACE/examples/Threads/Makefile.am +++ b/ACE/examples/Threads/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Timer_Queue/Makefile.am b/ACE/examples/Timer_Queue/Makefile.am index e2109fde6d6..0c504a1723d 100644 --- a/ACE/examples/Timer_Queue/Makefile.am +++ b/ACE/examples/Timer_Queue/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Web_Crawler/Makefile.am b/ACE/examples/Web_Crawler/Makefile.am index 00a30a4d2e1..028235b984e 100644 --- a/ACE/examples/Web_Crawler/Makefile.am +++ b/ACE/examples/Web_Crawler/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/netsvcs/Makefile.am b/ACE/netsvcs/Makefile.am index 422221e4029..d4bf0e1c092 100644 --- a/ACE/netsvcs/Makefile.am +++ b/ACE/netsvcs/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ lib \ diff --git a/ACE/netsvcs/clients/Logger/Makefile.am b/ACE/netsvcs/clients/Logger/Makefile.am index 8c3ae8decb3..af2c7cb74a8 100644 --- a/ACE/netsvcs/clients/Logger/Makefile.am +++ b/ACE/netsvcs/clients/Logger/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/netsvcs/clients/Makefile.am b/ACE/netsvcs/clients/Makefile.am index c959505ff73..5d7b4bd7e99 100644 --- a/ACE/netsvcs/clients/Makefile.am +++ b/ACE/netsvcs/clients/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Logger \ diff --git a/ACE/netsvcs/clients/Naming/Client/Makefile.am b/ACE/netsvcs/clients/Naming/Client/Makefile.am index 548b9be4a8e..f7b6d2ec5fd 100644 --- a/ACE/netsvcs/clients/Naming/Client/Makefile.am +++ b/ACE/netsvcs/clients/Naming/Client/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am index 38ed1977b42..1e427bfd1be 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/netsvcs/clients/Naming/Makefile.am b/ACE/netsvcs/clients/Naming/Makefile.am index 883b9bab54d..ad4d7a0b8af 100644 --- a/ACE/netsvcs/clients/Naming/Makefile.am +++ b/ACE/netsvcs/clients/Naming/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Client \ diff --git a/ACE/netsvcs/clients/Tokens/collection/Makefile.am b/ACE/netsvcs/clients/Tokens/collection/Makefile.am index 9d3fbcc5ddd..d2aa7bf8c1b 100644 --- a/ACE/netsvcs/clients/Tokens/collection/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/collection/Makefile.am @@ -15,4 +15,4 @@ noinst_PROGRAMS = \ collection_SOURCES = collection.cpp collection_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/libACE.la + $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am b/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am index d995e71620b..5e25ccd0fb3 100644 --- a/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am @@ -16,4 +16,4 @@ noinst_PROGRAMS = \ deadlock_detection_test_SOURCES = deadlock_detection_test.cpp deadlock_detection_test_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/libACE.la + $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/invariant/Makefile.am b/ACE/netsvcs/clients/Tokens/invariant/Makefile.am index 37817911015..83b621b5a42 100644 --- a/ACE/netsvcs/clients/Tokens/invariant/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/invariant/Makefile.am @@ -16,5 +16,5 @@ noinst_PROGRAMS = \ invariant_SOURCES = invariant.cpp invariant_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/libACE.la + $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/manual/Makefile.am b/ACE/netsvcs/clients/Tokens/manual/Makefile.am index b2945a96bd3..4a2cbf60788 100644 --- a/ACE/netsvcs/clients/Tokens/manual/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/manual/Makefile.am @@ -16,7 +16,7 @@ noinst_PROGRAMS = \ manual_SOURCES = manual.cpp manual_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/libACE.la + $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/netsvcs/clients/Tokens/mutex/Makefile.am b/ACE/netsvcs/clients/Tokens/mutex/Makefile.am index 63d02af7d97..56dd1efccf2 100644 --- a/ACE/netsvcs/clients/Tokens/mutex/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/mutex/Makefile.am @@ -16,6 +16,6 @@ noinst_PROGRAMS = \ test_mutex_SOURCES = test_mutex.cpp test_mutex_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/libACE.la + $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am b/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am index 265a3a09558..972d8a64faa 100644 --- a/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am @@ -16,5 +16,5 @@ noinst_PROGRAMS = \ rw_locks_SOURCES = rw_locks.cpp rw_locks_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/libACE.la + $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la diff --git a/ACE/netsvcs/lib/Makefile.am b/ACE/netsvcs/lib/Makefile.am index 7614800dc4e..54b8ed75617 100644 --- a/ACE/netsvcs/lib/Makefile.am +++ b/ACE/netsvcs/lib/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/netsvcs/servers/Makefile.am b/ACE/netsvcs/servers/Makefile.am index ded1ad91998..a01f7f89c56 100644 --- a/ACE/netsvcs/servers/Makefile.am +++ b/ACE/netsvcs/servers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/Makefile.am b/ACE/performance-tests/Makefile.am index 1aac8a5c388..8893d7354cb 100644 --- a/ACE/performance-tests/Makefile.am +++ b/ACE/performance-tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Misc \ diff --git a/ACE/performance-tests/Misc/Makefile.am b/ACE/performance-tests/Misc/Makefile.am index d6b7af67f43..965fc6cfb41 100644 --- a/ACE/performance-tests/Misc/Makefile.am +++ b/ACE/performance-tests/Misc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/SCTP/Makefile.am b/ACE/performance-tests/SCTP/Makefile.am index 8532440e3f6..6d5d23cac4f 100644 --- a/ACE/performance-tests/SCTP/Makefile.am +++ b/ACE/performance-tests/SCTP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am index 38021abd626..e2fabc53e18 100644 --- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am +++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/Server_Concurrency/Makefile.am b/ACE/performance-tests/Server_Concurrency/Makefile.am index 9a5b0c57e66..5d8482ab96d 100644 --- a/ACE/performance-tests/Server_Concurrency/Makefile.am +++ b/ACE/performance-tests/Server_Concurrency/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Leader_Follower \ diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am index feb7783689d..00d31705dcd 100644 --- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am +++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am index b050480b9bc..1c31462be1e 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,18 +16,27 @@ ACE_ROOT = $(top_srcdir) if !BUILD_ACE_FOR_TAO -noinst_LTLIBRARIES = libSynch_Benchmarks_Base_Test.la +noinst_LTLIBRARIES = libBase_Test.la -libSynch_Benchmarks_Base_Test_la_CPPFLAGS = \ +libBase_Test_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. + -I.. -libSynch_Benchmarks_Base_Test_la_SOURCES = \ +libBase_Test_la_SOURCES = \ Baseline_Test.cpp \ base_test.cpp \ mutex_test.cpp +../Synch_Lib: + mkdir -p ../Synch_Lib + +libBase_Test_la_DEPENDENCIES = \ + ../Synch_Lib + +libBase_Test_la_LDFLAGS = \ + -L../Synch_Lib + noinst_HEADERS = \ Baseline_Test.h \ Baseline_Test.inl diff --git a/ACE/performance-tests/Synch-Benchmarks/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Makefile.am index f0272750af1..6464aa9c07c 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -27,6 +27,9 @@ synch_driver_CPPFLAGS = \ synch_driver_SOURCES = \ synch_driver.cpp +synch_driver_LDFLAGS = \ + -LSynch_Lib + synch_driver_LDADD = \ $(top_builddir)/performance-tests/Synch-Benchmarks/Synch_Lib/libSynch_Lib.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am index 99d37c3aa72..6d0a1c0b6b9 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,14 +16,14 @@ ACE_ROOT = $(top_srcdir) if !BUILD_ACE_FOR_TAO -noinst_LTLIBRARIES = libSynch_Benchmarks_Perf_Test.la +noinst_LTLIBRARIES = libPerf_Test.la -libSynch_Benchmarks_Perf_Test_la_CPPFLAGS = \ +libPerf_Test_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. + -I.. -libSynch_Benchmarks_Perf_Test_la_SOURCES = \ +libPerf_Test_la_SOURCES = \ Adaptive_Lock_Performance_Test_Base.cpp \ Benchmark_Performance.cpp \ Performance_Test.cpp \ @@ -46,6 +46,15 @@ libSynch_Benchmarks_Perf_Test_la_SOURCES = \ sysvsema_test.cpp \ token_test.cpp +../Synch_Lib: + mkdir -p ../Synch_Lib + +libPerf_Test_la_DEPENDENCIES = \ + ../Synch_Lib + +libPerf_Test_la_LDFLAGS = \ + -L../Synch_Lib + noinst_HEADERS = \ Adaptive_Lock_Performance_Test_Base.h \ Benchmark_Performance.h \ diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am index 05c71adde0c..673ec4a0155 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/TCP/Makefile.am b/ACE/performance-tests/TCP/Makefile.am index 3ebae23da8e..d048881aeda 100644 --- a/ACE/performance-tests/TCP/Makefile.am +++ b/ACE/performance-tests/TCP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/UDP/Makefile.am b/ACE/performance-tests/UDP/Makefile.am index e9dc7db03f2..6aea010518d 100644 --- a/ACE/performance-tests/UDP/Makefile.am +++ b/ACE/performance-tests/UDP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/ace/HTBP/Makefile.am b/ACE/protocols/ace/HTBP/Makefile.am index 9119681ffca..bd824576b86 100644 --- a/ACE/protocols/ace/HTBP/Makefile.am +++ b/ACE/protocols/ace/HTBP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/ace/HTBP pkgconfigdir = @libdir@/pkgconfig @@ -72,7 +72,7 @@ CLEANFILES = \ ACE_HTBP.pc ACE_HTBP.pc: ${top_builddir}/config.status ${srcdir}/ACE_HTBP.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_HTBP.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ACE_HTBP.pc.in endif !BUILD_ACE_FOR_TAO diff --git a/ACE/protocols/ace/Makefile.am b/ACE/protocols/ace/Makefile.am index d62d1164dcc..c476b3583bc 100644 --- a/ACE/protocols/ace/Makefile.am +++ b/ACE/protocols/ace/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ HTBP \ diff --git a/ACE/protocols/ace/RMCast/Makefile.am b/ACE/protocols/ace/RMCast/Makefile.am index ac4adeea41e..51e73d4041e 100644 --- a/ACE/protocols/ace/RMCast/Makefile.am +++ b/ACE/protocols/ace/RMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/ace/RMCast pkgconfigdir = @libdir@/pkgconfig @@ -67,7 +67,7 @@ CLEANFILES = \ ACE_RMCast.pc ACE_RMCast.pc: ${top_builddir}/config.status ${srcdir}/ACE_RMCast.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_RMCast.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ACE_RMCast.pc.in endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS diff --git a/ACE/protocols/ace/TMCast/Makefile.am b/ACE/protocols/ace/TMCast/Makefile.am index c4873787693..c524083fd92 100644 --- a/ACE/protocols/ace/TMCast/Makefile.am +++ b/ACE/protocols/ace/TMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/ace/TMCast pkgconfigdir = @libdir@/pkgconfig @@ -57,7 +57,7 @@ CLEANFILES = \ ACE_TMCast.pc ACE_TMCast.pc: ${top_builddir}/config.status ${srcdir}/ACE_TMCast.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_TMCast.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ACE_TMCast.pc.in endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS diff --git a/ACE/protocols/examples/Makefile.am b/ACE/protocols/examples/Makefile.am index fd0f6f9494d..b435d1c3fe2 100644 --- a/ACE/protocols/examples/Makefile.am +++ b/ACE/protocols/examples/Makefile.am @@ -6,8 +6,9 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ - RMCast + RMCast \ + TMCast diff --git a/ACE/protocols/examples/RMCast/Makefile.am b/ACE/protocols/examples/RMCast/Makefile.am index 784d3215def..ef4f29c4f65 100644 --- a/ACE/protocols/examples/RMCast/Makefile.am +++ b/ACE/protocols/examples/RMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Send_Msg diff --git a/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am b/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am index a49d0afa6c7..eb9a09d771f 100644 --- a/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am +++ b/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/examples/TMCast/Makefile.am b/ACE/protocols/examples/TMCast/Makefile.am index ad8cc650602..358fc18ef31 100644 --- a/ACE/protocols/examples/TMCast/Makefile.am +++ b/ACE/protocols/examples/TMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Member diff --git a/ACE/protocols/examples/TMCast/Member/Makefile.am b/ACE/protocols/examples/TMCast/Member/Makefile.am index fe970a85ef5..c5c5c31c34f 100644 --- a/ACE/protocols/examples/TMCast/Member/Makefile.am +++ b/ACE/protocols/examples/TMCast/Member/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/Makefile.am b/ACE/protocols/tests/HTBP/Makefile.am index 7fd964b7c84..d38309ca6a4 100644 --- a/ACE/protocols/tests/HTBP/Makefile.am +++ b/ACE/protocols/tests/HTBP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ Reactor_Tests \ diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am b/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am index 813229103d5..153e1206bb1 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am b/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am index 2773356439b..870836f47f4 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am +++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am b/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am index 03775f077a4..c9628903cf1 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am +++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/ping/Makefile.am b/ACE/protocols/tests/HTBP/ping/Makefile.am index 279d82a03c0..b59b297e535 100644 --- a/ACE/protocols/tests/HTBP/ping/Makefile.am +++ b/ACE/protocols/tests/HTBP/ping/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/Makefile.am b/ACE/protocols/tests/Makefile.am index fd0f6f9494d..7bb6fdd829e 100644 --- a/ACE/protocols/tests/Makefile.am +++ b/ACE/protocols/tests/Makefile.am @@ -6,8 +6,9 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ + HTBP \ RMCast diff --git a/ACE/protocols/tests/RMCast/Makefile.am b/ACE/protocols/tests/RMCast/Makefile.am index 3c832d00c1c..dadabcac905 100644 --- a/ACE/protocols/tests/RMCast/Makefile.am +++ b/ACE/protocols/tests/RMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/tests/Makefile.am b/ACE/tests/Makefile.am index 0de38407ea0..f494e8ead55 100644 --- a/ACE/tests/Makefile.am +++ b/ACE/tests/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) SUBDIRS = \ . \ - HTBP \ SSL @@ -340,6 +339,21 @@ Bug_1576_Regression_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la +## Makefile.Bug_1890_Regression_Test.am +noinst_PROGRAMS += Bug_1890_Regression_Test + +Bug_1890_Regression_Test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) + +Bug_1890_Regression_Test_SOURCES = \ + $(ACE_ROOT)/tests/Main.cpp \ + Bug_1890_Regression_Test.cpp + +Bug_1890_Regression_Test_LDADD = \ + libTest_Output.la \ + $(ACE_BUILDDIR)/ace/libACE.la + ## Makefile.Bug_2368_Regression_Test.am noinst_PROGRAMS += Bug_2368_Regression_Test @@ -370,6 +384,36 @@ Bug_2497_Regression_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la +## Makefile.Bug_2540_Regression_Test.am +noinst_PROGRAMS += Bug_2540_Regression_Test + +Bug_2540_Regression_Test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) + +Bug_2540_Regression_Test_SOURCES = \ + $(ACE_ROOT)/tests/Main.cpp \ + Bug_2540_Regression_Test.cpp + +Bug_2540_Regression_Test_LDADD = \ + libTest_Output.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +## Makefile.Bug_2653_Regression_Test.am +noinst_PROGRAMS += Bug_2653_Regression_Test + +Bug_2653_Regression_Test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) + +Bug_2653_Regression_Test_SOURCES = \ + $(ACE_ROOT)/tests/Main.cpp \ + Bug_2653_Regression_Test.cpp + +Bug_2653_Regression_Test_LDADD = \ + libTest_Output.la \ + $(ACE_BUILDDIR)/ace/libACE.la + ## Makefile.CDR_Array_Test.am if !BUILD_ACE_FOR_TAO @@ -1024,6 +1068,21 @@ IOStream_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la +## Makefile.Integer_Truncate_Test.am +noinst_PROGRAMS += Integer_Truncate_Test + +Integer_Truncate_Test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) + +Integer_Truncate_Test_SOURCES = \ + $(ACE_ROOT)/tests/Main.cpp \ + Integer_Truncate_Test.cpp + +Integer_Truncate_Test_LDADD = \ + libTest_Output.la \ + $(ACE_BUILDDIR)/ace/libACE.la + ## Makefile.Lazy_Map_Manager_Test.am noinst_PROGRAMS += Lazy_Map_Manager_Test @@ -1040,6 +1099,8 @@ Lazy_Map_Manager_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Library_Unload.am + +if !BUILD_WINCE noinst_PROGRAMS += UnloadLibACE UnloadLibACE_SOURCES = \ @@ -1089,6 +1150,8 @@ UnloadLibACE_SOURCES = \ Upgradable_RW_Test.h \ test_config.h +endif !BUILD_WINCE + ## Makefile.Log_Msg_Test.am if !BUILD_ACE_FOR_TAO @@ -1915,7 +1978,7 @@ CLEANFILES = \ QtReactor_Test_moc.cpp QtReactor_Test_moc.cpp: $(srcdir)/QtReactor_Test.h - $(QTDIR)/bin/moc -o QtReactor_Test_moc.cpp $(srcdir)/QtReactor_Test.h + $(QTDIR)/bin/moc $(srcdir)/QtReactor_Test.h -o QtReactor_Test_moc.cpp noinst_PROGRAMS += QtReactor_Test @@ -2250,6 +2313,25 @@ SOCK_Dgram_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la +## Makefile.SOCK_Netlink_Test.am + +if !BUILD_ACE_FOR_TAO +noinst_PROGRAMS += SOCK_Netlink_Test + +SOCK_Netlink_Test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) + +SOCK_Netlink_Test_SOURCES = \ + $(ACE_ROOT)/tests/Main.cpp \ + SOCK_Netlink_Test.cpp + +SOCK_Netlink_Test_LDADD = \ + libTest_Output.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_ACE_FOR_TAO + ## Makefile.SOCK_SEQPACK_SCTP_Test.am if !BUILD_ACE_FOR_TAO diff --git a/ACE/tests/SSL/Makefile.am b/ACE/tests/SSL/Makefile.am index c3ae6261b1b..ee10293e8ca 100644 --- a/ACE/tests/SSL/Makefile.am +++ b/ACE/tests/SSL/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -45,7 +45,6 @@ endif BUILD_SSL ## Makefile.Thread_Pool_Reactor_SSL_Test.am if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Thread_Pool_Reactor_SSL_Test @@ -69,7 +68,6 @@ Thread_Pool_Reactor_SSL_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Clean up template repositories, etc. diff --git a/ACE/websvcs/Makefile.am b/ACE/websvcs/Makefile.am index be02feea0e1..038bf2ff84f 100644 --- a/ACE/websvcs/Makefile.am +++ b/ACE/websvcs/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc SUBDIRS = \ lib \ diff --git a/ACE/websvcs/lib/Makefile.am b/ACE/websvcs/lib/Makefile.am index 0536fecbb66..689c2933594 100644 --- a/ACE/websvcs/lib/Makefile.am +++ b/ACE/websvcs/lib/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/websvcs/tests/Makefile.am b/ACE/websvcs/tests/Makefile.am index 868befa72a0..88395996658 100644 --- a/ACE/websvcs/tests/Makefile.am +++ b/ACE/websvcs/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -type automake -noreldefs ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) |