ChangeLogTag:Fri Nov 12 17:23:41 2004 Steve Huston <shuston@riverace.com>

17 files changed, 862 insertions, 47 deletions

diff --git a/apps/Gateway/Gateway/Makefile.am b/apps/Gateway/Gateway/Makefile.am
new file mode 100644
index 00000000000..b3def668806
--- /dev/null
+++ b/apps/Gateway/Gateway/Makefile.am
@@ -0,0 +1,79 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+## Makefile.Gateway.am 
+noinst_LTLIBRARIES = libGateway.la
+
+libGateway_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+libGateway_la_SOURCES = \
+  Concrete_Connection_Handlers.cpp \
+  Config_Files.cpp \
+  Connection_Handler.cpp \
+  Connection_Handler_Acceptor.cpp \
+  Connection_Handler_Connector.cpp \
+  Event_Channel.cpp \
+  Event_Forwarding_Discriminator.cpp \
+  File_Parser.cpp \
+  Gateway.cpp \
+  Options.cpp
+
+libGateway_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la
+
+noinst_HEADERS = \
+  Concrete_Connection_Handlers.h \
+  Config_Files.h \
+  Connection_Handler.h \
+  Connection_Handler_Acceptor.h \
+  Connection_Handler_Connector.h \
+  Event_Channel.h \
+  Event_Forwarding_Discriminator.h \
+  File_Parser.h \
+  Gateway.h \
+  Options.h
+
+## Makefile.gatewayd.am 
+noinst_PROGRAMS = gatewayd
+
+gatewayd_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+gatewayd_SOURCES = \
+  gatewayd.cpp \
+  Concrete_Connection_Handlers.h \
+  Config_Files.h \
+  Connection_Handler.h \
+  Connection_Handler_Acceptor.h \
+  Connection_Handler_Connector.h \
+  Consumer_Dispatch_Set.h \
+  Event.h \
+  Event_Channel.h \
+  Event_Forwarding_Discriminator.h \
+  File_Parser.h \
+  Gateway.h \
+  Options.h
+
+gatewayd_LDADD = \
+ libGateway.la $(top_builddir)/ace/libACE.la
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/Gateway/Makefile.am b/apps/Gateway/Makefile.am
new file mode 100644
index 00000000000..ff47f4b6ecd
--- /dev/null
+++ b/apps/Gateway/Makefile.am
@@ -0,0 +1,14 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+SUBDIRS = \
+        Gateway \
+        Peer
+
diff --git a/apps/Gateway/Peer/Makefile.am b/apps/Gateway/Peer/Makefile.am
new file mode 100644
index 00000000000..f176288b702
--- /dev/null
+++ b/apps/Gateway/Peer/Makefile.am
@@ -0,0 +1,53 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+## Makefile.Gateway_Peer.am 
+noinst_LTLIBRARIES = libGateway_Peer.la
+
+libGateway_Peer_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+libGateway_Peer_la_SOURCES = \
+  Options.cpp \
+  Peer.cpp
+
+libGateway_Peer_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la
+
+noinst_HEADERS = \
+  Options.h \
+  Peer.h
+
+## Makefile.gateway_peerd.am 
+noinst_PROGRAMS = peerd
+
+peerd_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+peerd_SOURCES = \
+  peerd.cpp \
+  Options.h \
+  Peer.h
+
+peerd_LDADD = \
+ libGateway_Peer.la $(top_builddir)/ace/libACE.la
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/JAWS/Makefile.am b/apps/JAWS/Makefile.am
new file mode 100644
index 00000000000..5703744183c
--- /dev/null
+++ b/apps/JAWS/Makefile.am
@@ -0,0 +1,14 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+SUBDIRS = \
+        clients \
+        server
+
diff --git a/apps/JAWS/clients/Blobby/Makefile.am b/apps/JAWS/clients/Blobby/Makefile.am
new file mode 100644
index 00000000000..39d64c798e6
--- /dev/null
+++ b/apps/JAWS/clients/Blobby/Makefile.am
@@ -0,0 +1,39 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+## Makefile.blobby.am 
+noinst_PROGRAMS = blobby
+
+blobby_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+blobby_SOURCES = \
+  Blob.cpp \
+  Blob_Handler.cpp \
+  Options.cpp \
+  blobby.cpp \
+  Blob.h \
+  Blob_Handler.h \
+  Options.h
+
+blobby_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/JAWS/clients/Caching/Makefile.am b/apps/JAWS/clients/Caching/Makefile.am
new file mode 100644
index 00000000000..1111db6d6c2
--- /dev/null
+++ b/apps/JAWS/clients/Caching/Makefile.am
@@ -0,0 +1,44 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+## Makefile.http_client.am 
+
+if BUILD_ACE_FILECACHE
+noinst_PROGRAMS += http_client
+
+http_client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+http_client_SOURCES = \
+  http_client.cpp \
+  http_handler.cpp \
+  http_handler.h \
+  Local_Locator.i \
+  Locator_Request_Reply.i \
+  URL_Locator.i \
+  URL_Properties.i
+
+http_client_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACE_FILECACHE
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/JAWS/clients/Makefile.am b/apps/JAWS/clients/Makefile.am
new file mode 100644
index 00000000000..6f338fd5cc8
--- /dev/null
+++ b/apps/JAWS/clients/Makefile.am
@@ -0,0 +1,14 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+SUBDIRS = \
+        Blobby \
+        Caching
+
diff --git a/apps/JAWS/server/Makefile.am b/apps/JAWS/server/Makefile.am
new file mode 100644
index 00000000000..a707307a052
--- /dev/null
+++ b/apps/JAWS/server/Makefile.am
@@ -0,0 +1,90 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+noinst_HEADERS =
+noinst_LTLIBRARIES =
+## Makefile.JAWS.am 
+
+if BUILD_ACE_FILECACHE
+noinst_LTLIBRARIES += libJAWS.la
+
+libJAWS_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DACE_BUILD_SVC_DLL
+
+libJAWS_la_SOURCES = \
+  HTTP_Config.cpp \
+  HTTP_Handler.cpp \
+  HTTP_Helpers.cpp \
+  HTTP_Request.cpp \
+  HTTP_Response.cpp \
+  HTTP_Server.cpp \
+  IO.cpp \
+  JAWS_Concurrency.cpp \
+  JAWS_Pipeline.cpp \
+  Parse_Headers.cpp
+
+libJAWS_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la
+
+noinst_HEADERS += \
+  HTTP_Config.h \
+  HTTP_Handler.h \
+  HTTP_Helpers.h \
+  HTTP_Request.h \
+  HTTP_Response.h \
+  HTTP_Server.h \
+  IO.h \
+  JAWS_Concurrency.h \
+  JAWS_Pipeline.h \
+  Parse_Headers.h
+
+endif BUILD_ACE_FILECACHE
+
+## Makefile.JAWS_server.am 
+
+if BUILD_ACE_FILECACHE
+noinst_PROGRAMS += main
+
+main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+main_SOURCES = \
+  main.cpp \
+  HTTP_Config.h \
+  HTTP_Handler.h \
+  HTTP_Helpers.h \
+  HTTP_Request.h \
+  HTTP_Response.h \
+  HTTP_Server.h \
+  IO.h \
+  JAWS_Concurrency.h \
+  JAWS_Pipeline.h \
+  JAWS_Pipeline_Handler.h \
+  Parse_Headers.h
+
+main_LDADD = \
+ libJAWS.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACE_FILECACHE
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/JAWS3/Makefile.am b/apps/JAWS3/Makefile.am
new file mode 100644
index 00000000000..647eab9416b
--- /dev/null
+++ b/apps/JAWS3/Makefile.am
@@ -0,0 +1,13 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+SUBDIRS = \
+        jaws3
+
diff --git a/apps/JAWS3/jaws3/Makefile.am b/apps/JAWS3/jaws3/Makefile.am
new file mode 100644
index 00000000000..45bf8854f68
--- /dev/null
+++ b/apps/JAWS3/jaws3/Makefile.am
@@ -0,0 +1,125 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+## Makefile.JAWS3.am 
+noinst_LTLIBRARIES = libJAWS3.la
+
+libJAWS3_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(srcdir)/.. \
+  -DJAWS_BUILD_DLL
+
+libJAWS3_la_SOURCES = \
+  Asynch_IO.cpp \
+  Concurrency.cpp \
+  Config_File.cpp \
+  Datagram.cpp \
+  Event_Completer.cpp \
+  Event_Dispatcher.cpp \
+  FILE.cpp \
+  IO.cpp \
+  Options.cpp \
+  Protocol_Handler.cpp \
+  Reactive_IO.cpp \
+  Signal_Task.cpp \
+  Symbol_Table.cpp \
+  Synch_IO.cpp \
+  THYBRID_Concurrency.cpp \
+  TPOOL_Concurrency.cpp \
+  TPR_Concurrency.cpp \
+  Task_Timer.cpp \
+  Templates.cpp \
+  Timer.cpp \
+  Timer_Helpers.cpp
+
+libJAWS3_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la
+
+noinst_HEADERS = \
+  Asynch_IO.h \
+  Asynch_IO_Helpers.h \
+  Cached_Allocator_T.h \
+  Concurrency.h \
+  Concurrency_T.h \
+  Config_File.h \
+  Datagram.h \
+  Event_Completer.h \
+  Event_Dispatcher.h \
+  Event_Result.h \
+  Export.h \
+  FILE.h \
+  IO.h \
+  Options.h \
+  Protocol_Handler.h \
+  Reactive_IO.h \
+  Reactive_IO_Helpers.h \
+  Signal_Task.h \
+  Symbol_Table.h \
+  Synch_IO.h \
+  THYBRID_Concurrency.h \
+  TPOOL_Concurrency.h \
+  TPR_Concurrency.h \
+  Task_Timer.h \
+  Timer.h \
+  Timer_Helpers.h \
+  Cached_Allocator_T.cpp \
+  Concurrency_T.cpp
+
+## Makefile.JAWS3_server.am 
+noinst_PROGRAMS = main
+
+main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(srcdir)/..
+
+main_SOURCES = \
+  main.cpp \
+  Asynch_IO.h \
+  Asynch_IO_Helpers.h \
+  Cached_Allocator_T.h \
+  Concurrency.h \
+  Concurrency_T.h \
+  Config_File.h \
+  Datagram.h \
+  Event_Completer.h \
+  Event_Dispatcher.h \
+  Event_Result.h \
+  Export.h \
+  FILE.h \
+  IO.h \
+  Options.h \
+  Protocol_Handler.h \
+  Reactive_IO.h \
+  Reactive_IO_Helpers.h \
+  Signal_Task.h \
+  Symbol_Table.h \
+  Synch_IO.h \
+  THYBRID_Concurrency.h \
+  TPOOL_Concurrency.h \
+  TPR_Concurrency.h \
+  Task_Timer.h \
+  Timer.h \
+  Timer_Helpers.h
+
+main_LDADD = \
+ libJAWS3.la $(top_builddir)/ace/libACE.la
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/Makefile.am b/apps/Makefile.am
index df5ee272ad5..973a19ca6d9 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -6,15 +6,14 @@
 ## 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 -hierarchy -make_coexistence -exclude build,Kokyu
+## /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
 
-##SUBDIRS = \
-##        Gateway \
-##        JAWS \
-##        JAWS3 \
-##        drwho \
-##        gperf \
-##        mkcsregdb \
-##        soreduce
+SUBDIRS = \
+        Gateway \
+        JAWS \
+        JAWS3 \
+        drwho \
+        gperf \
+        mkcsregdb \
+        soreduce
 
-SUBDIRS = gperf
diff --git a/apps/drwho/Makefile.am b/apps/drwho/Makefile.am
new file mode 100644
index 00000000000..72eccea2f62
--- /dev/null
+++ b/apps/drwho/Makefile.am
@@ -0,0 +1,199 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+## Makefile.drwho__client.am 
+
+if BUILD_RWHO
+if !BUILD_USES_WCHAR
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+client_SOURCES = \
+  BS_Client.cpp \
+  BS_Server.cpp \
+  Binary_Search.cpp \
+  CM_Client.cpp \
+  CM_Server.cpp \
+  Drwho_Node.cpp \
+  File_Manager.cpp \
+  HT_Client.cpp \
+  HT_Server.cpp \
+  Hash_Table.cpp \
+  Multicast_Manager.cpp \
+  Options.cpp \
+  PMC_All.cpp \
+  PMC_Flo.cpp \
+  PMC_Ruser.cpp \
+  PMC_Usr.cpp \
+  PMS_All.cpp \
+  PMS_Flo.cpp \
+  PMS_Ruser.cpp \
+  PMS_Usr.cpp \
+  PM_Client.cpp \
+  PM_Server.cpp \
+  Protocol_Manager.cpp \
+  Protocol_Record.cpp \
+  Rwho_DB_Manager.cpp \
+  SL_Client.cpp \
+  SL_Server.cpp \
+  SML_Client.cpp \
+  SML_Server.cpp \
+  SMR_Client.cpp \
+  SMR_Server.cpp \
+  SM_Client.cpp \
+  SM_Server.cpp \
+  Search_Struct.cpp \
+  Single_Lookup.cpp \
+  client.cpp \
+  BS_Client.h \
+  BS_Server.h \
+  Binary_Search.h \
+  CM_Client.h \
+  CM_Server.h \
+  Drwho_Node.h \
+  File_Manager.h \
+  HT_Client.h \
+  HT_Server.h \
+  Hash_Table.h \
+  Multicast_Manager.h \
+  Options.h \
+  PMC_All.h \
+  PMC_Flo.h \
+  PMC_Ruser.h \
+  PMC_Usr.h \
+  PMS_All.h \
+  PMS_Flo.h \
+  PMS_Ruser.h \
+  PMS_Usr.h \
+  PM_Client.h \
+  PM_Server.h \
+  Protocol_Manager.h \
+  Protocol_Record.h \
+  Rwho_DB_Manager.h \
+  SL_Client.h \
+  SL_Server.h \
+  SML_Client.h \
+  SML_Server.h \
+  SMR_Client.h \
+  SMR_Server.h \
+  SM_Client.h \
+  SM_Server.h \
+  Search_Struct.h \
+  Single_Lookup.h
+
+client_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+endif BUILD_RWHO
+
+## Makefile.drwho__server.am 
+
+if BUILD_RWHO
+if !BUILD_USES_WCHAR
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+server_SOURCES = \
+  BS_Client.cpp \
+  BS_Server.cpp \
+  Binary_Search.cpp \
+  CM_Client.cpp \
+  CM_Server.cpp \
+  Drwho_Node.cpp \
+  File_Manager.cpp \
+  HT_Client.cpp \
+  HT_Server.cpp \
+  Hash_Table.cpp \
+  Multicast_Manager.cpp \
+  Options.cpp \
+  PMC_All.cpp \
+  PMC_Flo.cpp \
+  PMC_Ruser.cpp \
+  PMC_Usr.cpp \
+  PMS_All.cpp \
+  PMS_Flo.cpp \
+  PMS_Ruser.cpp \
+  PMS_Usr.cpp \
+  PM_Client.cpp \
+  PM_Server.cpp \
+  Protocol_Manager.cpp \
+  Protocol_Record.cpp \
+  Rwho_DB_Manager.cpp \
+  SL_Client.cpp \
+  SL_Server.cpp \
+  SML_Client.cpp \
+  SML_Server.cpp \
+  SMR_Client.cpp \
+  SMR_Server.cpp \
+  SM_Client.cpp \
+  SM_Server.cpp \
+  Search_Struct.cpp \
+  Single_Lookup.cpp \
+  server.cpp \
+  BS_Client.h \
+  BS_Server.h \
+  Binary_Search.h \
+  CM_Client.h \
+  CM_Server.h \
+  Drwho_Node.h \
+  File_Manager.h \
+  HT_Client.h \
+  HT_Server.h \
+  Hash_Table.h \
+  Multicast_Manager.h \
+  Options.h \
+  PMC_All.h \
+  PMC_Flo.h \
+  PMC_Ruser.h \
+  PMC_Usr.h \
+  PMS_All.h \
+  PMS_Flo.h \
+  PMS_Ruser.h \
+  PMS_Usr.h \
+  PM_Client.h \
+  PM_Server.h \
+  Protocol_Manager.h \
+  Protocol_Record.h \
+  Rwho_DB_Manager.h \
+  SL_Client.h \
+  SL_Server.h \
+  SML_Client.h \
+  SML_Server.h \
+  SMR_Client.h \
+  SMR_Server.h \
+  SM_Client.h \
+  SM_Server.h \
+  Search_Struct.h \
+  Single_Lookup.h
+
+server_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+endif BUILD_RWHO
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/gperf/Makefile.am b/apps/gperf/Makefile.am
index b79114704a3..9f74ede4861 100644
--- a/apps/gperf/Makefile.am
+++ b/apps/gperf/Makefile.am
@@ -6,10 +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 -hierarchy -make_coexistence -exclude build,Kokyu
+## /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
 
 SUBDIRS = \
-        src
-
-#	tests
+        src \
+        tests
 
diff --git a/apps/gperf/src/Makefile.am b/apps/gperf/src/Makefile.am
index a028ba6dddb..7e0c6584393 100644
--- a/apps/gperf/src/Makefile.am
+++ b/apps/gperf/src/Makefile.am
@@ -6,13 +6,16 @@
 ## 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 -hierarchy -make_coexistence -exclude build,Kokyu
+## /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
 
-ACE_ROOT = $(top_srcdir)
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
+bin_PROGRAMS =
 ## Makefile.gperf.am 
-bin_PROGRAMS = gperf
+
+if !BUILD_USES_WCHAR
+bin_PROGRAMS += gperf
 
 gperf_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -39,10 +42,14 @@ gperf_SOURCES = \
   Vectors.h
 
 gperf_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/gperf/tests/Makefile.am b/apps/gperf/tests/Makefile.am
index 18b54bf992e..6f350b62400 100644
--- a/apps/gperf/tests/Makefile.am
+++ b/apps/gperf/tests/Makefile.am
@@ -6,27 +6,32 @@
 ## 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 -hierarchy -make_coexistence -exclude build,Kokyu
+## /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
 
-ACE_ROOT = $(top_srcdir)
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+CLEANFILES =
+BUILT_SOURCES =
 ## Makefile.adainset.am 
 
-BUILT_SOURCES = \
+if !BUILD_USES_WCHAR
+
+BUILT_SOURCES += \
   ada.cpp
 
-CLEANFILES = \
+CLEANFILES += \
   ada.cpp \
   ada-stamp
 
 ada.cpp: ada-stamp
 
 ada-stamp: $(srcdir)/ada.gperf
-	$(top_builddir)/apps/gperf/src/gperf -a -k1,4,$$ $(srcdir)/ada.gperf> $@
+	../src/gperf -a -k1,4,$$ $(srcdir)/ada.gperf> $@
 	@touch $@
 
-noinst_PROGRAMS = aout
+noinst_PROGRAMS += aout
 
 aout_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -37,10 +42,14 @@ aout_SOURCES = \
   test.cpp
 
 aout_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Makefile.cinset.am 
 
+if !BUILD_USES_WCHAR
+
 BUILT_SOURCES += \
   c.cpp
 
@@ -51,7 +60,7 @@ CLEANFILES += \
 c.cpp: c-stamp
 
 c-stamp: $(srcdir)/c.gperf
-	$(top_builddir)/apps/gperf/src/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf> $@
+	../src/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf> $@
 	@touch $@
 
 noinst_PROGRAMS += cout
@@ -65,10 +74,14 @@ cout_SOURCES = \
   test.cpp
 
 cout_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Makefile.cppinset.am 
 
+if !BUILD_USES_WCHAR
+
 BUILT_SOURCES += \
   cpp.cpp
 
@@ -79,7 +92,7 @@ CLEANFILES += \
 cpp.cpp: cpp-stamp
 
 cpp-stamp: $(srcdir)/cpp.gperf
-	$(top_builddir)/apps/gperf/src/gperf -a -D $(srcdir)/cpp.gperf> $@
+	../src/gperf -a -D $(srcdir)/cpp.gperf> $@
 	@touch $@
 
 noinst_PROGRAMS += cppout
@@ -93,10 +106,14 @@ cppout_SOURCES = \
   test.cpp
 
 cppout_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Makefile.iinset.am 
 
+if !BUILD_USES_WCHAR
+
 BUILT_SOURCES += \
   idl.cpp
 
@@ -107,7 +124,7 @@ CLEANFILES += \
 idl.cpp: idl-stamp
 
 idl-stamp: $(srcdir)/idl.gperf
-	$(top_builddir)/apps/gperf/src/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf> $@
+	../src/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf> $@
 	@touch $@
 
 noinst_PROGRAMS += iout
@@ -121,10 +138,14 @@ iout_SOURCES = \
   test.cpp
 
 iout_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Makefile.iinset2.am 
 
+if !BUILD_USES_WCHAR
+
 BUILT_SOURCES += \
   idl.cpp
 
@@ -135,7 +156,7 @@ CLEANFILES += \
 idl.cpp: idl-stamp
 
 idl-stamp: $(srcdir)/idl.gperf
-	$(top_builddir)/apps/gperf/src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf> $@
+	../src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf> $@
 	@touch $@
 
 noinst_PROGRAMS += iout2
@@ -149,10 +170,14 @@ iout2_SOURCES = \
   test.cpp
 
 iout2_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Makefile.m3inset.am 
 
+if !BUILD_USES_WCHAR
+
 BUILT_SOURCES += \
   modula3.cpp
 
@@ -163,7 +188,7 @@ CLEANFILES += \
 modula3.cpp: modula3-stamp
 
 modula3-stamp: $(srcdir)/modula3.gperf
-	$(top_builddir)/apps/gperf/src/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf> $@
+	../src/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf> $@
 	@touch $@
 
 noinst_PROGRAMS += m3out
@@ -177,10 +202,14 @@ m3out_SOURCES = \
   test.cpp
 
 m3out_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Makefile.pinset.am 
 
+if !BUILD_USES_WCHAR
+
 BUILT_SOURCES += \
   pascal.cpp
 
@@ -191,7 +220,7 @@ CLEANFILES += \
 pascal.cpp: pascal-stamp
 
 pascal-stamp: $(srcdir)/pascal.gperf
-	$(top_builddir)/apps/gperf/src/gperf -a -o -S2 -p $(srcdir)/pascal.gperf> $@
+	../src/gperf -a -o -S2 -p $(srcdir)/pascal.gperf> $@
 	@touch $@
 
 noinst_PROGRAMS += pout
@@ -205,10 +234,14 @@ pout_SOURCES = \
   test.cpp
 
 pout_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Makefile.preinset.am 
 
+if !BUILD_USES_WCHAR
+
 BUILT_SOURCES += \
   adadefs.cpp
 
@@ -219,7 +252,7 @@ CLEANFILES += \
 adadefs.cpp: adadefs-stamp
 
 adadefs-stamp: $(srcdir)/adadefs.gperf
-	$(top_builddir)/apps/gperf/src/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf> $@
+	../src/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf> $@
 	@touch $@
 
 noinst_PROGRAMS += preout
@@ -233,10 +266,14 @@ preout_SOURCES = \
   test.cpp
 
 preout_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Makefile.taoinset.am 
 
+if !BUILD_USES_WCHAR
+
 BUILT_SOURCES += \
   tao.cpp
 
@@ -247,7 +284,7 @@ CLEANFILES += \
 tao.cpp: tao-stamp
 
 tao-stamp: $(srcdir)/tao.gperf
-	$(top_builddir)/apps/gperf/src/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf> $@
+	../src/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf> $@
 	@touch $@
 
 noinst_PROGRAMS += taoout
@@ -261,10 +298,14 @@ taoout_SOURCES = \
   test.cpp
 
 taoout_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Makefile.tinset.am 
 
+if !BUILD_USES_WCHAR
+
 BUILT_SOURCES += \
   corba.cpp
 
@@ -275,7 +316,7 @@ CLEANFILES += \
 corba.cpp: corba-stamp
 
 corba-stamp: $(srcdir)/corba.gperf
-	$(top_builddir)/apps/gperf/src/gperf -a -o $(srcdir)/corba.gperf> $@
+	../src/gperf -a -o $(srcdir)/corba.gperf> $@
 	@touch $@
 
 noinst_PROGRAMS += tout
@@ -289,10 +330,14 @@ tout_SOURCES = \
   test.cpp
 
 tout_LDADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/mkcsregdb/Makefile.am b/apps/mkcsregdb/Makefile.am
new file mode 100644
index 00000000000..b7b62795cd1
--- /dev/null
+++ b/apps/mkcsregdb/Makefile.am
@@ -0,0 +1,33 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+## Makefile.mkcsregdb.am 
+noinst_PROGRAMS = mkcsregdb
+
+mkcsregdb_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+mkcsregdb_SOURCES = \
+  mkcsregdb.cpp
+
+mkcsregdb_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/soreduce/Makefile.am b/apps/soreduce/Makefile.am
new file mode 100644
index 00000000000..6dde89dae48
--- /dev/null
+++ b/apps/soreduce/Makefile.am
@@ -0,0 +1,48 @@
+##  Process this file with automake to create Makefile.in
+##
+## $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:
+## /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
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+## Makefile.soreduce.am 
+
+if !BUILD_USES_WCHAR
+noinst_PROGRAMS += soreduce
+
+soreduce_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+soreduce_SOURCES = \
+  Library.cpp \
+  Obj_Module.cpp \
+  SO_Group.cpp \
+  Sig_List.cpp \
+  Signature.cpp \
+  soreduce.cpp \
+  Library.h \
+  Obj_Module.h \
+  SO_Group.h \
+  Sig_List.h \
+  Signature.h
+
+soreduce_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB