ChangeLogTag:Fri Mar 30 11:12:53 2001 Carlos O'Ryan <coryan@uci.edu>

2 files changed, 54 insertions, 42 deletions

diff --git a/apps/Gateway/Gateway/Makefile b/apps/Gateway/Gateway/Makefile
index 8dd7785f701..42d1463d219 100644
--- a/apps/Gateway/Gateway/Makefile
+++ b/apps/Gateway/Gateway/Makefile
@@ -252,14 +252,15 @@ endif
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \
- Config_Files.h File_Parser.h File_Parser.cpp Event.h Options.h \
- Connection_Handler_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ Connection_Handler.h Config_Files.h File_Parser.h File_Parser.cpp \
+ Event.h Options.h Connection_Handler_Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i Consumer_Dispatch_Set.h \
- Event_Forwarding_Discriminator.h Concrete_Connection_Handlers.h
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ Consumer_Dispatch_Set.h Event_Forwarding_Discriminator.h \
+ Concrete_Connection_Handlers.h
 
 .obj/Config_Files.o .obj/Config_Files.so .shobj/Config_Files.o .shobj/Config_Files.so: Config_Files.cpp Config_Files.h File_Parser.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -285,7 +286,8 @@ endif
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i File_Parser.cpp Event.h Options.h \
+ $(ACE_ROOT)/ace/OS.i \
+ File_Parser.cpp Event.h Options.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -317,7 +319,8 @@ endif
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i
 
-.obj/File_Parser.o .obj/File_Parser.so .shobj/File_Parser.o .shobj/File_Parser.so: File_Parser.cpp $(ACE_ROOT)/ace/OS.h \
+.obj/File_Parser.o .obj/File_Parser.so .shobj/File_Parser.o .shobj/File_Parser.so: File_Parser.cpp \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -340,9 +343,11 @@ endif
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i File_Parser.h File_Parser.cpp
+ $(ACE_ROOT)/ace/OS.i \
+ File_Parser.h File_Parser.cpp
 
-.obj/Gateway.o .obj/Gateway.so .shobj/Gateway.o .shobj/Gateway.so: Gateway.cpp $(ACE_ROOT)/ace/Service_Config.h \
+.obj/Gateway.o .obj/Gateway.so .shobj/Gateway.o .shobj/Gateway.so: Gateway.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -432,8 +437,8 @@ endif
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Config_Files.h \
- File_Parser.h File_Parser.cpp Event.h Event_Channel.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ Config_Files.h File_Parser.h File_Parser.cpp Event.h Event_Channel.h \
  Connection_Handler_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
@@ -536,13 +541,13 @@ endif
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \
- Options.h Connection_Handler_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ Connection_Handler.h Options.h Connection_Handler_Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i Consumer_Dispatch_Set.h \
- Event_Forwarding_Discriminator.h Gateway.h
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ Consumer_Dispatch_Set.h Event_Forwarding_Discriminator.h Gateway.h
 
 .obj/Event_Channel.o .obj/Event_Channel.so .shobj/Event_Channel.o .shobj/Event_Channel.so: Event_Channel.cpp Connection_Handler_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
@@ -737,14 +742,14 @@ endif
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \
- Config_Files.h File_Parser.h File_Parser.cpp Event.h Options.h \
- Event_Channel.h Connection_Handler_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ Connection_Handler.h Config_Files.h File_Parser.h File_Parser.cpp \
+ Event.h Options.h Event_Channel.h Connection_Handler_Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i Consumer_Dispatch_Set.h \
- Event_Forwarding_Discriminator.h
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ Consumer_Dispatch_Set.h Event_Forwarding_Discriminator.h
 
 .obj/Event_Forwarding_Discriminator.o .obj/Event_Forwarding_Discriminator.so .shobj/Event_Forwarding_Discriminator.o .shobj/Event_Forwarding_Discriminator.so: Event_Forwarding_Discriminator.cpp \
  Event_Forwarding_Discriminator.h \
@@ -856,8 +861,9 @@ endif
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Event.h \
- Consumer_Dispatch_Set.h $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ Event.h Consumer_Dispatch_Set.h \
+ $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Array_Base.h \
@@ -866,7 +872,8 @@ endif
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp
 
-.obj/Options.o .obj/Options.so .shobj/Options.o .shobj/Options.so: Options.cpp Event.h $(ACE_ROOT)/ace/OS.h \
+.obj/Options.o .obj/Options.so .shobj/Options.o .shobj/Options.so: Options.cpp Event.h \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -889,7 +896,8 @@ endif
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i Options.h \
+ $(ACE_ROOT)/ace/OS.i \
+ Options.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -1117,14 +1125,15 @@ endif
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \
- Config_Files.h File_Parser.h File_Parser.cpp Event.h Options.h \
- Connection_Handler_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ Connection_Handler.h Config_Files.h File_Parser.h File_Parser.cpp \
+ Event.h Options.h Connection_Handler_Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i Consumer_Dispatch_Set.h \
- Event_Forwarding_Discriminator.h Concrete_Connection_Handlers.h
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ Consumer_Dispatch_Set.h Event_Forwarding_Discriminator.h \
+ Concrete_Connection_Handlers.h
 
 .obj/Connection_Handler_Acceptor.o .obj/Connection_Handler_Acceptor.so .shobj/Connection_Handler_Acceptor.o .shobj/Connection_Handler_Acceptor.so: Connection_Handler_Acceptor.cpp \
  Event_Channel.h Connection_Handler_Connector.h \
@@ -1320,14 +1329,14 @@ endif
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \
- Config_Files.h File_Parser.h File_Parser.cpp Event.h Options.h \
- Connection_Handler_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ Connection_Handler.h Config_Files.h File_Parser.h File_Parser.cpp \
+ Event.h Options.h Connection_Handler_Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i Consumer_Dispatch_Set.h \
- Event_Forwarding_Discriminator.h
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ Consumer_Dispatch_Set.h Event_Forwarding_Discriminator.h
 
 .obj/Connection_Handler_Connector.o .obj/Connection_Handler_Connector.so .shobj/Connection_Handler_Connector.o .shobj/Connection_Handler_Connector.so: Connection_Handler_Connector.cpp \
  Connection_Handler_Connector.h \
@@ -1523,7 +1532,8 @@ endif
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \
- Config_Files.h File_Parser.h File_Parser.cpp Event.h Options.h
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ Connection_Handler.h Config_Files.h File_Parser.h File_Parser.cpp \
+ Event.h Options.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/apps/Gateway/Peer/Makefile b/apps/Gateway/Peer/Makefile
index 5a06a34b600..75c92afd1c8 100644
--- a/apps/Gateway/Peer/Makefile
+++ b/apps/Gateway/Peer/Makefile
@@ -53,7 +53,8 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/Options.o .obj/Options.so .shobj/Options.o .shobj/Options.so: Options.cpp $(ACE_ROOT)/ace/Get_Opt.h \
+.obj/Options.o .obj/Options.so .shobj/Options.o .shobj/Options.so: Options.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -96,10 +97,11 @@ endif
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl Options.h \
- ../Gateway/Event.h
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ Options.h ../Gateway/Event.h
 
-.obj/Peer.o .obj/Peer.so .shobj/Peer.o .shobj/Peer.so: Peer.cpp Peer.h $(ACE_ROOT)/ace/Service_Config.h \
+.obj/Peer.o .obj/Peer.so .shobj/Peer.o .shobj/Peer.so: Peer.cpp Peer.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -295,7 +297,7 @@ endif
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i Options.h \
- ../Gateway/Event.h
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ Options.h ../Gateway/Event.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY