ChangeLogTag:Fri Dec 8 07:48:32 2000 Christopher Kohlhoff <chris@kohlhoff.com>

3 files changed, 50 insertions, 39 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 979e7344cfb..bb23e34d0f1 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Fri Dec  8 07:48:32 2000  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * tao/Makefile.bor:
+        * tao/Strategies/Makefile.bor:
+
+          Added/removed source files.
+
 Fri Dec  8 06:06:47 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/GIOP_Message_Lite.cpp (process_request_message):
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index a258fde8c83..06f67938316 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -5,12 +5,12 @@
 NAME = TAO
 
 DIRS = \
-        PortableServer \
-        DynamicAny \
-        DynamicInterface \
-        IORTable \
-        IORManipulation \
-        Strategies \
+	PortableServer \
+	DynamicAny \
+	DynamicInterface \
+	IORTable \
+	IORManipulation \
+	Strategies \
 	SmartProxies
 
 OBJFILES = \
@@ -32,6 +32,7 @@ OBJFILES = \
 	$(OBJDIR)\ClientRequestInfo.obj \
 	$(OBJDIR)\Connection_Descriptor_Interface.obj \
 	$(OBJDIR)\Connector_Registry.obj \
+	$(OBJDIR)\Connector_Impl.obj \
 	$(OBJDIR)\CONV_FRAMEC.obj \
 	$(OBJDIR)\CONV_FRAMES.obj \
 	$(OBJDIR)\corbafwd.obj \
@@ -54,17 +55,20 @@ OBJFILES = \
 	$(OBJDIR)\Exception.obj \
 	$(OBJDIR)\Exclusive_TMS.obj \
 	$(OBJDIR)\FILE_Parser.obj \
-	$(OBJDIR)\GIOP_Message_Accept_State.obj \
-	$(OBJDIR)\GIOP_Message_Acceptors.obj \
 	$(OBJDIR)\GIOP_Message_Base.obj \
-	$(OBJDIR)\GIOP_Message_Connectors.obj \
+	$(OBJDIR)\GIOP_Message_Generator_Parser.obj \
+	$(OBJDIR)\GIOP_Message_Generator_Parser_10.obj \
+	$(OBJDIR)\GIOP_Message_Generator_Parser_11.obj \
+	$(OBJDIR)\GIOP_Message_Generator_Parser_12.obj \
+	$(OBJDIR)\GIOP_Message_Generator_Parser_Impl.obj \
 	$(OBJDIR)\GIOP_Message_Headers.obj \
 	$(OBJDIR)\GIOP_Message_Lite.obj \
+	$(OBJDIR)\GIOP_Message_Locate_Header.obj \
 	$(OBJDIR)\GIOP_Message_State.obj \
 	$(OBJDIR)\GIOP_Utils.obj \
 	$(OBJDIR)\GIOPC.obj \
 	$(OBJDIR)\IIOP_Acceptor.obj \
-	$(OBJDIR)\IIOP_Connect.obj \
+	$(OBJDIR)\IIOP_Connection_Handler.obj \
 	$(OBJDIR)\IIOP_Connector.obj \
 	$(OBJDIR)\IIOP_Endpoint.obj \
 	$(OBJDIR)\iiop_endpoints.obj \
@@ -112,9 +116,9 @@ OBJFILES = \
 	$(OBJDIR)\ORB_Table.obj \
 	$(OBJDIR)\params.obj \
 	$(OBJDIR)\Parser_Registry.obj \
-        $(OBJDIR)\Services_Activate.obj \
-        $(OBJDIR)\Service_Callbacks.obj \
-        $(OBJDIR)\Fault_Tolerance_Service.obj \
+	$(OBJDIR)\Services_Activate.obj \
+	$(OBJDIR)\Service_Callbacks.obj \
+	$(OBJDIR)\Fault_Tolerance_Service.obj \
 	$(OBJDIR)\Pluggable.obj \
 	$(OBJDIR)\Pluggable_Messaging.obj \
 	$(OBJDIR)\Pluggable_Messaging_Utils.obj \
@@ -187,10 +191,10 @@ CPPDIR = .
 
 INCDIR_NAME = tao
 INCLUDES = \
-         *.h *.i *.inl *_T.cpp \
-         TAO_Singleton.cpp \
-         orb.idl \
-         Policy.pidl
+	*.h *.i *.inl *_T.cpp \
+	TAO_Singleton.cpp \
+	orb.idl \
+	Policy.pidl
 
 LIBFILES = $(ACE_LIB)
 
diff --git a/TAO/tao/Strategies/Makefile.bor b/TAO/tao/Strategies/Makefile.bor
index 9ade54969f8..a31d611c9f4 100644
--- a/TAO/tao/Strategies/Makefile.bor
+++ b/TAO/tao/Strategies/Makefile.bor
@@ -5,33 +5,33 @@
 NAME = TAO_Strategies
 
 OBJFILES = \
-        $(OBJDIR)\UIOP_Factory.obj \
-        $(OBJDIR)\UIOP_Lite_Factory.obj \
-        $(OBJDIR)\UIOP_Profile.obj \
-        $(OBJDIR)\UIOP_Transport.obj \
-        $(OBJDIR)\UIOP_Connector.obj \
-        $(OBJDIR)\UIOP_Acceptor.obj \
-        $(OBJDIR)\UIOP_Connect.obj \
-        $(OBJDIR)\UIOP_Endpoint.obj \
-        $(OBJDIR)\SHMIOP_Factory.obj \
-        $(OBJDIR)\SHMIOP_Profile.obj \
-        $(OBJDIR)\SHMIOP_Transport.obj \
-        $(OBJDIR)\SHMIOP_Connector.obj \
-        $(OBJDIR)\SHMIOP_Acceptor.obj \
-        $(OBJDIR)\SHMIOP_Connect.obj \
-        $(OBJDIR)\SHMIOP_Endpoint.obj \
-        $(OBJDIR)\TAO_Strategies_Internal.obj \
-        $(OBJDIR)\uiop_endpoints.obj \
-        $(OBJDIR)\advanced_resource.obj \
-        $(OBJDIR)\Reactor_Per_Priority.obj \
-        $(OBJDIR)\Linear_Priority_Mapping.obj \
-        $(OBJDIR)\Direct_Priority_Mapping.obj
+	$(OBJDIR)\UIOP_Factory.obj \
+	$(OBJDIR)\UIOP_Lite_Factory.obj \
+	$(OBJDIR)\UIOP_Profile.obj \
+	$(OBJDIR)\UIOP_Transport.obj \
+	$(OBJDIR)\UIOP_Connector.obj \
+	$(OBJDIR)\UIOP_Acceptor.obj \
+	$(OBJDIR)\UIOP_Connection_Handler.obj \
+	$(OBJDIR)\UIOP_Endpoint.obj \
+	$(OBJDIR)\SHMIOP_Factory.obj \
+	$(OBJDIR)\SHMIOP_Profile.obj \
+	$(OBJDIR)\SHMIOP_Transport.obj \
+	$(OBJDIR)\SHMIOP_Connector.obj \
+	$(OBJDIR)\SHMIOP_Acceptor.obj \
+	$(OBJDIR)\SHMIOP_Connection_Handler.obj \
+	$(OBJDIR)\SHMIOP_Endpoint.obj \
+	$(OBJDIR)\TAO_Strategies_Internal.obj \
+	$(OBJDIR)\uiop_endpoints.obj \
+	$(OBJDIR)\advanced_resource.obj \
+	$(OBJDIR)\Reactor_Per_Priority.obj \
+	$(OBJDIR)\Linear_Priority_Mapping.obj \
+	$(OBJDIR)\Direct_Priority_Mapping.obj
 
 !ifdef STATIC
 CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_STRATEGIES_CFLAGS)
 !else
 CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_STRATEGIES_CFLAGS) \
-        -DTAO_STRATEGIES_BUILD_DLL
+	-DTAO_STRATEGIES_BUILD_DLL
 !endif
 
 CPPDIR = .