4 files changed, 14 insertions, 131 deletions
diff --git a/tests/Multiple_Inheritance/Makefile.am b/tests/Multiple_Inheritance/Makefile.am
deleted file mode 100644
index 5fea80abc5e..00000000000
--- a/tests/Multiple_Inheritance/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##  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:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Multiple_Inheritance_Idl.am
-
-BUILT_SOURCES = \
-  Multiple_InheritanceC.cpp \
-  Multiple_InheritanceC.h \
-  Multiple_InheritanceC.inl \
-  Multiple_InheritanceS.cpp \
-  Multiple_InheritanceS.h \
-  Multiple_InheritanceS.inl
-
-CLEANFILES = \
-  Multiple_Inheritance-stamp \
-  Multiple_InheritanceC.cpp \
-  Multiple_InheritanceC.h \
-  Multiple_InheritanceC.inl \
-  Multiple_InheritanceS.cpp \
-  Multiple_InheritanceS.h \
-  Multiple_InheritanceS.inl
-
-Multiple_InheritanceC.cpp Multiple_InheritanceC.h Multiple_InheritanceC.inl Multiple_InheritanceS.cpp Multiple_InheritanceS.h Multiple_InheritanceS.inl: Multiple_Inheritance-stamp
-
-Multiple_Inheritance-stamp: $(srcdir)/Multiple_Inheritance.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Multiple_Inheritance.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Multiple_Inheritance.idl
-
-## Makefile.Multiple_Inheritance_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Multiple_InheritanceC.cpp \
-  client.cpp \
-  Multiple_Inheritance_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Multiple_Inheritance_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Multiple_InheritanceC.cpp \
-  Multiple_InheritanceS.cpp \
-  server.cpp \
-  Multiple_Inheritance_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## 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/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index f8a3e188bfe..ae87b53f82a 100644
--- a/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -2,8 +2,6 @@
 
 #include "Multiple_InheritanceS.h"
 
-ACE_RCSID(Multiple_Inheritance, Multiple_Inheritance_i, "$Id$")
-
 class Multiple_Inheritance_i : public POA_D
 {
 public:
diff --git a/tests/Multiple_Inheritance/client.cpp b/tests/Multiple_Inheritance/client.cpp
index 6eb79d73d47..b49b16472c0 100644
--- a/tests/Multiple_Inheritance/client.cpp
+++ b/tests/Multiple_Inheritance/client.cpp
@@ -1,19 +1,16 @@
-// $Id$
-//
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/Multiple_Inheritance
-//
-//  = FILENAME
-//     client.cpp
-//
-//  = DESCRIPTION
-//      A client program for the Multiple Inheritance module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
+//=============================================================================
+/**
+ *  @file     client.cpp
+ *
+ *  $Id$
+ *
+ *    A client program for the Multiple Inheritance module
+ *
+ *
+ *  @author  Irfan Pyarali
+ */
+//=============================================================================
+
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
@@ -22,8 +19,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Multiple_Inheritance, client, "$Id$")
-
 static ACE_TCHAR *ior = 0;
 static ACE_TCHAR *ior_input_file = 0;
 
diff --git a/tests/Multiple_Inheritance/server.cpp b/tests/Multiple_Inheritance/server.cpp
index d8bfb2b812d..2cf2385d16f 100644
--- a/tests/Multiple_Inheritance/server.cpp
+++ b/tests/Multiple_Inheritance/server.cpp
@@ -6,8 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Multiple_Inheritance, server, "$Id$")
-
 static ACE_TCHAR *ior_output_file = 0;
 
 Multiple_Inheritance_i::Multiple_Inheritance_i (void)
@@ -38,7 +36,7 @@ parse_args (int argc, ACE_TCHAR **argv)
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }