3 files changed, 33 insertions, 50 deletions

diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index 0f87432d246..ce3e2942219 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -381,7 +381,7 @@ Client_Test::set_proc_local (void)
 {
   // Close down original name space
   NAMING_CONTEXT ()->close ();
-  this->name_options_->nameserver_host (ACE_TEXT ("localhost"));
+  this->name_options_->nameserver_host ("localhost");
   this->name_options_->context (ACE_Naming_Context::PROC_LOCAL);
   return NAMING_CONTEXT ()->open (ACE_Naming_Context::PROC_LOCAL);
 }
@@ -391,7 +391,7 @@ Client_Test::set_node_local (void)
 {
   // Close down original name space
   NAMING_CONTEXT ()->close ();
-  this->name_options_->nameserver_host (ACE_TEXT ("localhost"));
+  this->name_options_->nameserver_host ("localhost");
   this->name_options_->context (ACE_Naming_Context::NODE_LOCAL);
   return NAMING_CONTEXT ()->open (ACE_Naming_Context::NODE_LOCAL);
 }
@@ -404,7 +404,7 @@ Client_Test::set_host (const char *hostname, int port)
 
   this->name_options_->context (ACE_Naming_Context::NET_LOCAL);
   // Set Name Options
-  this->name_options_->nameserver_host (ACE_TEXT_CHAR_TO_TCHAR (hostname));
+  this->name_options_->nameserver_host (hostname);
   this->name_options_->nameserver_port (port);
 
   return NAMING_CONTEXT ()->open (ACE_Naming_Context::NET_LOCAL);
diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am
index c1e6cfc66ac..95879536177 100644
--- a/netsvcs/clients/Naming/Client/Makefile.am
+++ b/netsvcs/clients/Naming/Client/Makefile.am
@@ -1,50 +1,31 @@
-##  Process this file with automake to create Makefile.in
+##----------------------------------------------------------------------------
+##       $Id$
 ##
-## $Id$
+##       Makefile for the client programs that test the ACE network services
+##----------------------------------------------------------------------------
+
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
+##  Process this file with automake to create Makefile.in
 ##
-## 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
-
-ACE_BUILDDIR = $(top_builddir)
-
-## Makefile.Netsvsc_Client_Test_Lib.am 
-noinst_LTLIBRARIES = libClient_Test.la
-
-libClient_Test_la_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
-  -I$(ACE_BUILDDIR) \
-  -DACE_CLIENT_TEST_BUILD_DLL
 
-libClient_Test_la_SOURCES = \
-  Client_Test.cpp
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
-libClient_Test_la_LIBADD = \
- $(top_builddir)/ace/libACE.la
+noinst_LIBRARIES = libClient_Test.a
 
-noinst_HEADERS = \
-  Client_Test.h
+libClient_Test_a_SOURCES = Client_Test.cpp Client_Test.h
 
-## Makefile.Netsvcs_Client_Test.am 
-noinst_PROGRAMS = main
+noinst_PROGRAMS = \
+  main
 
-main_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
-  -I$(ACE_BUILDDIR)
+main_SOURCES = main.cpp
+main_LDADD = libClient_Test.a \
+             $(top_builddir)/ace/libACE.la
 
-main_SOURCES = \
-  main.cpp \
-  Client_Test.h
+noinst_DATA = svc.conf svc2.conf
 
-main_LDADD = \
- libClient_Test.la $(top_builddir)/ace/libACE.la
+EXTRA_DIST = $(noinst_DATA)
 
 ## 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 -rf ptrepository SunWS_cache Templates.DB
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp
index 25a87893d27..75456ba8cad 100644
--- a/netsvcs/clients/Naming/Client/main.cpp
+++ b/netsvcs/clients/Naming/Client/main.cpp
@@ -12,7 +12,7 @@
 ACE_RCSID(Client, main, "$Id$")
 
 int
-ACE_TMAIN (int, ACE_TCHAR *argv[])
+main (int, char *argv[])
 {
   ACE_Service_Config daemon;
   ACE_ARGV new_args;
@@ -20,13 +20,13 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
   // Load the existing <argv> into our new one.
   new_args.add (argv);
   // Enable loading of static services.
-  new_args.add (ACE_TEXT ("-y")); 
+  new_args.add ("-y"); 
   // Enable debugging within dynamically linked services.
-  new_args.add (ACE_TEXT ("-d")); 
+  new_args.add ("-d"); 
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("argc = %d\n"),
-              new_args.argc ()));
+              ACE_TEXT (new_args.argc ())));
 
   // Print the contents of the combined <ACE_ARGV>.
   for (int i = 0; i < new_args.argc (); i++)
@@ -39,23 +39,25 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
                    new_args.argv ()) == -1)
     {
       if (errno != ENOENT)
-	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")),
-                          1);
+	ACE_ERROR ((LM_ERROR,
+                    "%p\n%a",
+                    "open",
+                    1));
       else // Use static binding.
 	{
           ACE_ARGV args;
 
           args.add (argv[0]);
-	  args.add (ACE_TEXT ("-p10011")); // Port number.
+	  args.add ("-p10011"); // Port number.
 	  ACE_Service_Object *so =
             ACE_SVC_INVOKE (ACE_Naming_Context);
 
 	  if (so->init (args.argc (),
                         args.argv ()) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("%p\n"),
-                               ACE_TEXT ("ACE_Naming_Context")),
-                              1);
+	    ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "ACE_Naming_Context",
+                        1));
 
 	  so = ACE_SVC_INVOKE (Client_Test);