ChangeLogTag: Tue Jun 28 20:52:22 2005 J.T. Conklin <jtc@acorntoolworks.com>

1 files changed, 82 insertions, 69 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
index c98ebf3590c..a0611fba82a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am
+++ b/TAO/orbsvcs/ImplRepo_Service/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 -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,29 +21,29 @@ bin_PROGRAMS =
 ## Makefile.ImR_Activator_IDL.am
 
 BUILT_SOURCES = \
-  ImR_ActivatorS_T.inl \
-  ImR_ActivatorC.inl \
-  ImR_ActivatorS.inl \
+  ImR_ActivatorC.cpp \
   ImR_ActivatorC.h \
+  ImR_ActivatorC.inl \
+  ImR_ActivatorS.cpp \
   ImR_ActivatorS.h \
+  ImR_ActivatorS.inl \
+  ImR_ActivatorS_T.cpp \
   ImR_ActivatorS_T.h \
-  ImR_ActivatorC.cpp \
-  ImR_ActivatorS.cpp \
-  ImR_ActivatorS_T.cpp
+  ImR_ActivatorS_T.inl
 
 CLEANFILES = \
   ImR_Activator-stamp \
-  ImR_ActivatorS_T.inl \
-  ImR_ActivatorC.inl \
-  ImR_ActivatorS.inl \
+  ImR_ActivatorC.cpp \
   ImR_ActivatorC.h \
+  ImR_ActivatorC.inl \
+  ImR_ActivatorS.cpp \
   ImR_ActivatorS.h \
+  ImR_ActivatorS.inl \
+  ImR_ActivatorS_T.cpp \
   ImR_ActivatorS_T.h \
-  ImR_ActivatorC.cpp \
-  ImR_ActivatorS.cpp \
-  ImR_ActivatorS_T.cpp
+  ImR_ActivatorS_T.inl
 
-ImR_ActivatorS_T.inl ImR_ActivatorC.inl ImR_ActivatorS.inl ImR_ActivatorC.h ImR_ActivatorS.h ImR_ActivatorS_T.h ImR_ActivatorC.cpp ImR_ActivatorS.cpp ImR_ActivatorS_T.cpp: ImR_Activator-stamp
+ImR_ActivatorC.cpp ImR_ActivatorC.h ImR_ActivatorC.inl ImR_ActivatorS.cpp ImR_ActivatorS.h ImR_ActivatorS.inl ImR_ActivatorS_T.cpp ImR_ActivatorS_T.h ImR_ActivatorS_T.inl: ImR_Activator-stamp
 
 ImR_Activator-stamp: $(srcdir)/ImR_Activator.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl
@@ -56,8 +61,8 @@ libTAO_ImR_Activator_IDL_la_CPPFLAGS = \
   -DACTIVATOR_IDL_BUILD_DLL
 
 libTAO_ImR_Activator_IDL_la_SOURCES = \
-  ImR_ActivatorC.cpp \
-  ImR_ActivatorS.cpp
+  ImR_ActivatorS.cpp \
+  ImR_ActivatorC.cpp
 
 noinst_HEADERS = \
   ImR_Activator.idl \
@@ -74,63 +79,63 @@ noinst_HEADERS = \
 if BUILD_CORBA_MESSAGING
 
 BUILT_SOURCES += \
-  AsyncStartupWaiterS_T.inl \
-  AsyncStartupWaiterC.inl \
-  AsyncStartupWaiterS.inl \
-  AsyncStartupWaiterC.h \
-  AsyncStartupWaiterS.h \
-  AsyncStartupWaiterS_T.h \
-  AsyncStartupWaiterC.cpp \
-  AsyncStartupWaiterS.cpp \
-  AsyncStartupWaiterS_T.cpp
-
-CLEANFILES += \
-  AsyncStartupWaiter-stamp \
-  AsyncStartupWaiterS_T.inl \
-  AsyncStartupWaiterC.inl \
-  AsyncStartupWaiterS.inl \
-  AsyncStartupWaiterC.h \
-  AsyncStartupWaiterS.h \
-  AsyncStartupWaiterS_T.h \
-  AsyncStartupWaiterC.cpp \
-  AsyncStartupWaiterS.cpp \
-  AsyncStartupWaiterS_T.cpp
-
-AsyncStartupWaiterS_T.inl AsyncStartupWaiterC.inl AsyncStartupWaiterS.inl AsyncStartupWaiterC.h AsyncStartupWaiterS.h AsyncStartupWaiterS_T.h AsyncStartupWaiterC.cpp AsyncStartupWaiterS.cpp AsyncStartupWaiterS_T.cpp: AsyncStartupWaiter-stamp
-
-AsyncStartupWaiter-stamp: $(srcdir)/AsyncStartupWaiter.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  ImR_LocatorS_T.inl \
-  ImR_LocatorC.inl \
-  ImR_LocatorS.inl \
+  ImR_LocatorC.cpp \
   ImR_LocatorC.h \
+  ImR_LocatorC.inl \
+  ImR_LocatorS.cpp \
   ImR_LocatorS.h \
+  ImR_LocatorS.inl \
+  ImR_LocatorS_T.cpp \
   ImR_LocatorS_T.h \
-  ImR_LocatorC.cpp \
-  ImR_LocatorS.cpp \
-  ImR_LocatorS_T.cpp
+  ImR_LocatorS_T.inl
 
 CLEANFILES += \
   ImR_Locator-stamp \
-  ImR_LocatorS_T.inl \
-  ImR_LocatorC.inl \
-  ImR_LocatorS.inl \
+  ImR_LocatorC.cpp \
   ImR_LocatorC.h \
+  ImR_LocatorC.inl \
+  ImR_LocatorS.cpp \
   ImR_LocatorS.h \
+  ImR_LocatorS.inl \
+  ImR_LocatorS_T.cpp \
   ImR_LocatorS_T.h \
-  ImR_LocatorC.cpp \
-  ImR_LocatorS.cpp \
-  ImR_LocatorS_T.cpp
+  ImR_LocatorS_T.inl
 
-ImR_LocatorS_T.inl ImR_LocatorC.inl ImR_LocatorS.inl ImR_LocatorC.h ImR_LocatorS.h ImR_LocatorS_T.h ImR_LocatorC.cpp ImR_LocatorS.cpp ImR_LocatorS_T.cpp: ImR_Locator-stamp
+ImR_LocatorC.cpp ImR_LocatorC.h ImR_LocatorC.inl ImR_LocatorS.cpp ImR_LocatorS.h ImR_LocatorS.inl ImR_LocatorS_T.cpp ImR_LocatorS_T.h ImR_LocatorS_T.inl: ImR_Locator-stamp
 
 ImR_Locator-stamp: $(srcdir)/ImR_Locator.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl
 	@touch $@
 
+BUILT_SOURCES += \
+  AsyncStartupWaiterC.cpp \
+  AsyncStartupWaiterC.h \
+  AsyncStartupWaiterC.inl \
+  AsyncStartupWaiterS.cpp \
+  AsyncStartupWaiterS.h \
+  AsyncStartupWaiterS.inl \
+  AsyncStartupWaiterS_T.cpp \
+  AsyncStartupWaiterS_T.h \
+  AsyncStartupWaiterS_T.inl
+
+CLEANFILES += \
+  AsyncStartupWaiter-stamp \
+  AsyncStartupWaiterC.cpp \
+  AsyncStartupWaiterC.h \
+  AsyncStartupWaiterC.inl \
+  AsyncStartupWaiterS.cpp \
+  AsyncStartupWaiterS.h \
+  AsyncStartupWaiterS.inl \
+  AsyncStartupWaiterS_T.cpp \
+  AsyncStartupWaiterS_T.h \
+  AsyncStartupWaiterS_T.inl
+
+AsyncStartupWaiterC.cpp AsyncStartupWaiterC.h AsyncStartupWaiterC.inl AsyncStartupWaiterS.cpp AsyncStartupWaiterS.h AsyncStartupWaiterS.inl AsyncStartupWaiterS_T.cpp AsyncStartupWaiterS_T.h AsyncStartupWaiterS_T.inl: AsyncStartupWaiter-stamp
+
+AsyncStartupWaiter-stamp: $(srcdir)/AsyncStartupWaiter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl
+	@touch $@
+
 noinst_LTLIBRARIES += libTAO_ImR_Locator_IDL.la
 
 libTAO_ImR_Locator_IDL_la_CPPFLAGS = \
@@ -143,10 +148,10 @@ libTAO_ImR_Locator_IDL_la_CPPFLAGS = \
   -DLOCATOR_IDL_BUILD_DLL
 
 libTAO_ImR_Locator_IDL_la_SOURCES = \
-  AsyncStartupWaiterC.cpp \
-  AsyncStartupWaiterS.cpp \
+  ImR_LocatorS.cpp \
   ImR_LocatorC.cpp \
-  ImR_LocatorS.cpp
+  AsyncStartupWaiterS.cpp \
+  AsyncStartupWaiterC.cpp
 
 noinst_HEADERS += \
   AsyncStartupWaiter.idl \
@@ -186,9 +191,9 @@ libTAO_ImR_Activator_la_CPPFLAGS = \
   -DACTIVATOR_BUILD_DLL
 
 libTAO_ImR_Activator_la_SOURCES = \
-  Activator_Loader.cpp \
+  ImR_Activator_i.cpp \
   Activator_Options.cpp \
-  ImR_Activator_i.cpp
+  Activator_Loader.cpp
 
 libTAO_ImR_Activator_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
@@ -232,8 +237,8 @@ ImR_Activator_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 ImR_Activator_SOURCES = \
-  Activator_NT_Service.cpp \
   ImR_Activator.cpp \
+  Activator_NT_Service.cpp \
   Activator_NT_Service.h
 
 ImR_Activator_LDADD = \
@@ -243,6 +248,8 @@ ImR_Activator_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
@@ -275,16 +282,16 @@ libTAO_ImR_Locator_la_CPPFLAGS = \
 libTAO_ImR_Locator_la_SOURCES = \
   Activator_Info.cpp \
   Adapter_Activator.cpp \
-  AsyncStartupWaiter_i.cpp \
   Forwarder.cpp \
-  INS_Locator.cpp \
   ImR_Locator_i.cpp \
-  Iterator.cpp \
+  AsyncStartupWaiter_i.cpp \
+  INS_Locator.cpp \
+  Locator_XMLHandler.cpp \
   Locator_Loader.cpp \
   Locator_Options.cpp \
-  Locator_Repository.cpp \
-  Locator_XMLHandler.cpp \
-  Server_Info.cpp
+  Iterator.cpp \
+  Server_Info.cpp \
+  Locator_Repository.cpp
 
 libTAO_ImR_Locator_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
@@ -293,10 +300,13 @@ libTAO_ImR_Locator_la_LIBADD = \
   libTAO_ImR_Locator_IDL.la \
   libTAO_ImR_Activator_IDL.la \
   $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
@@ -350,10 +360,13 @@ ImplRepo_Service_LDADD = \
   libTAO_ImR_Activator_IDL.la \
   libTAO_ImR_Locator_IDL.la \
   $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \