ChangeLogTag: Thu Feb 24 16:07:15 2005 J.T. Conklin <jtc@acorntoolworks.com>

1 files changed, 46 insertions, 53 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
index 99a66870116..5f83ad381af 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
@@ -2,11 +2,6 @@
 ##
 ## $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 TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -22,34 +17,34 @@ noinst_HEADERS =
 CLEANFILES =
 BUILT_SOURCES =
 
-## Makefile.ImR_Activator_IDL.am 
+## Makefile.ImR_Activator_IDL.am
 
 if BUILD_CORBA_MESSAGING
 
 BUILT_SOURCES += \
-  ImR_ActivatorS_T.cpp \
   ImR_ActivatorC.inl \
   ImR_ActivatorS.inl \
   ImR_ActivatorS_T.inl \
-  ImR_ActivatorC.cpp \
-  ImR_ActivatorS.cpp \
   ImR_ActivatorC.h \
   ImR_ActivatorS.h \
-  ImR_ActivatorS_T.h
+  ImR_ActivatorS_T.h \
+  ImR_ActivatorC.cpp \
+  ImR_ActivatorS.cpp \
+  ImR_ActivatorS_T.cpp
 
 CLEANFILES += \
-  ImR_ActivatorS_T.cpp \
+  ImR_Activator-stamp \
   ImR_ActivatorC.inl \
   ImR_ActivatorS.inl \
   ImR_ActivatorS_T.inl \
-  ImR_ActivatorC.cpp \
-  ImR_ActivatorS.cpp \
   ImR_ActivatorC.h \
   ImR_ActivatorS.h \
   ImR_ActivatorS_T.h \
-  ImR_Activator-stamp
+  ImR_ActivatorC.cpp \
+  ImR_ActivatorS.cpp \
+  ImR_ActivatorS_T.cpp
 
-ImR_ActivatorS_T.cpp ImR_ActivatorC.inl ImR_ActivatorS.inl ImR_ActivatorS_T.inl ImR_ActivatorC.cpp ImR_ActivatorS.cpp ImR_ActivatorC.h ImR_ActivatorS.h ImR_ActivatorS_T.h: ImR_Activator-stamp
+ImR_ActivatorC.inl ImR_ActivatorS.inl ImR_ActivatorS_T.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_Activator-stamp: $(srcdir)/ImR_Activator.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GH -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl
@@ -74,6 +69,7 @@ libTAO_ImR_Activator_IDL_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_ImR_Activator_IDL_la_LIBADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -81,46 +77,46 @@ libTAO_ImR_Activator_IDL_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 noinst_HEADERS += \
+  ImR_Activator.idl \
   ImR_ActivatorC.h \
-  ImR_ActivatorS.h \
-  ImR_ActivatorS_T.h \
-  activator_idl_export.h \
   ImR_ActivatorC.inl \
+  ImR_ActivatorS.h \
   ImR_ActivatorS.inl \
-  ImR_ActivatorS_T.inl \
   ImR_ActivatorS_T.cpp \
-  ImR_Activator.idl
+  ImR_ActivatorS_T.h \
+  ImR_ActivatorS_T.inl \
+  activator_idl_export.h
 
 endif BUILD_CORBA_MESSAGING
 
-## Makefile.ImR_Locator_IDL.am 
+## Makefile.ImR_Locator_IDL.am
 
 if BUILD_CORBA_MESSAGING
 
 BUILT_SOURCES += \
-  ImR_LocatorS_T.cpp \
   ImR_LocatorC.inl \
   ImR_LocatorS.inl \
   ImR_LocatorS_T.inl \
-  ImR_LocatorC.cpp \
-  ImR_LocatorS.cpp \
   ImR_LocatorC.h \
   ImR_LocatorS.h \
-  ImR_LocatorS_T.h
+  ImR_LocatorS_T.h \
+  ImR_LocatorC.cpp \
+  ImR_LocatorS.cpp \
+  ImR_LocatorS_T.cpp
 
 CLEANFILES += \
-  ImR_LocatorS_T.cpp \
+  ImR_Locator-stamp \
   ImR_LocatorC.inl \
   ImR_LocatorS.inl \
   ImR_LocatorS_T.inl \
-  ImR_LocatorC.cpp \
-  ImR_LocatorS.cpp \
   ImR_LocatorC.h \
   ImR_LocatorS.h \
   ImR_LocatorS_T.h \
-  ImR_Locator-stamp
+  ImR_LocatorC.cpp \
+  ImR_LocatorS.cpp \
+  ImR_LocatorS_T.cpp
 
-ImR_LocatorS_T.cpp ImR_LocatorC.inl ImR_LocatorS.inl ImR_LocatorS_T.inl ImR_LocatorC.cpp ImR_LocatorS.cpp ImR_LocatorC.h ImR_LocatorS.h ImR_LocatorS_T.h: ImR_Locator-stamp
+ImR_LocatorC.inl ImR_LocatorS.inl ImR_LocatorS_T.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_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
@@ -146,25 +142,26 @@ libTAO_ImR_Locator_IDL_la_LDFLAGS = \
 
 libTAO_ImR_Locator_IDL_la_LIBADD = \
   libTAO_ImR_Activator_IDL.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 noinst_HEADERS += \
+  ImR_Locator.idl \
   ImR_LocatorC.h \
-  ImR_LocatorS.h \
-  ImR_LocatorS_T.h \
-  locator_idl_export.h \
   ImR_LocatorC.inl \
+  ImR_LocatorS.h \
   ImR_LocatorS.inl \
-  ImR_LocatorS_T.inl \
   ImR_LocatorS_T.cpp \
-  ImR_Locator.idl
+  ImR_LocatorS_T.h \
+  ImR_LocatorS_T.inl \
+  locator_idl_export.h
 
 endif BUILD_CORBA_MESSAGING
 
-## Makefile.ImR_Activator.am 
+## Makefile.ImR_Activator.am
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
@@ -193,6 +190,7 @@ libTAO_ImR_Activator_la_LDFLAGS = \
 libTAO_ImR_Activator_la_LIBADD = \
   libTAO_ImR_Activator_IDL.la \
   libTAO_ImR_Locator_IDL.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
@@ -210,7 +208,7 @@ endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
-## Makefile.ImR_Activator_Service.am 
+## Makefile.ImR_Activator_Service.am
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
@@ -232,13 +230,11 @@ ImR_Activator_SOURCES = \
   ImR_Activator.cpp \
   Activator_NT_Service.h
 
-ImR_Activator_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
 ImR_Activator_LDADD = \
   libTAO_ImR_Activator.la \
   libTAO_ImR_Activator_IDL.la \
   libTAO_ImR_Locator_IDL.la \
+  $(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_PortableServer.la \
@@ -252,10 +248,10 @@ endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
-## Makefile.ImR_Locator.am 
+## Makefile.ImR_Locator.am
 
-if BUILD_CORBA_MESSAGING
 if BUILD_ACEXML
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_ImR_Locator.la
@@ -289,6 +285,7 @@ libTAO_ImR_Locator_la_LDFLAGS = \
 libTAO_ImR_Locator_la_LIBADD = \
   libTAO_ImR_Locator_IDL.la \
   libTAO_ImR_Activator_IDL.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
@@ -315,13 +312,13 @@ noinst_HEADERS += \
   utils.h
 
 endif !BUILD_MINIMUM_CORBA
-endif BUILD_ACEXML
 endif BUILD_CORBA_MESSAGING
+endif BUILD_ACEXML
 
-## Makefile.ImR_Locator_Service.am 
+## Makefile.ImR_Locator_Service.am
 
-if BUILD_CORBA_MESSAGING
 if BUILD_ACEXML
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += ImplRepo_Service
@@ -340,13 +337,11 @@ ImplRepo_Service_SOURCES = \
   Locator_NT_Service.cpp \
   Locator_NT_Service.h
 
-ImplRepo_Service_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
 ImplRepo_Service_LDADD = \
   libTAO_ImR_Locator.la \
   libTAO_ImR_Activator_IDL.la \
   libTAO_ImR_Locator_IDL.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
@@ -358,10 +353,10 @@ ImplRepo_Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif BUILD_ACEXML
 endif BUILD_CORBA_MESSAGING
+endif BUILD_ACEXML
 
-## Makefile.tao_imr.am 
+## Makefile.tao_imr.am
 
 if !BUILD_MINIMUM_CORBA
 
@@ -378,10 +373,8 @@ tao_imr_SOURCES = \
   tao_imr_i.cpp \
   tao_imr_i.h
 
-tao_imr_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
 tao_imr_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la