4 files changed, 71 insertions, 3 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 89fb0fd6c84..ae081ba56fe 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Fri Nov 21 21:48:27 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* orbsvcs/orbsvcs/AV.mpc:
+
+	  Added SCT_SEQ.cpp coditionally in makefiles only when sctp is
+	  enabled. 
+
+	* orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
+	* orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp:
+
+	  Fixed compile error that showed up in MPC builds. They needed a
+	  couple of inclusions.
+
 Fri Nov 21 21:05:32 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index 7346a7b9a53..562cd760f02 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -20,15 +20,68 @@ project(AV) : orbsvcslib, core, property, naming, qos {
       Null_MediaCtrlS.cpp
       sfpC.cpp
       sfpS.cpp
-      AV
+      AV/AVStreams_i.cpp
+      AV/AV_Core.cpp
+      AV/Endpoint_Strategy.cpp
+      AV/Endpoint_Strategy_T.cpp
+      AV/Fill_ACE_QoS.cpp
+      AV/FlowSpec_Entry.cpp
+      AV/Flows_T.cpp
+      AV/MCast.cpp
+      AV/Nil.cpp
+      AV/Policy.cpp
+      AV/Protocol_Factory.cpp
+      AV/QoS_UDP.cpp
+      AV/RTCP.cpp
+      AV/RTCP_Channel.cpp
+      AV/RTCP_Packet.cpp
+      AV/RTP.cpp
+      AV/TCP.cpp
+      AV/Transport.cpp
+      AV/UDP.cpp
+      AV/default_resource.cpp
+      AV/media_timer.cpp
+      AV/sfp.cpp
     }
   }
+
+  verbatim(gnuace,top) {
+  ifeq ($(sctp),1)
+    AV += SCTP_SEQ
+  endif
+  }
   Header_Files {
     Channel_Clients_T.h
-    AV
+    AV/AVStreams_i.h
+    AV/AV_Core.h
+    AV/AV_export.h
+    AV/Endpoint_Strategy.h
+    AV/Endpoint_Strategy_T.h
+    AV/Fill_ACE_QoS.h
+    AV/FlowSpec_Entry.h
+    AV/Flows_T.h
+    AV/MCast.h
+    AV/Nil.h
+    AV/Policy.h
+    AV/Protocol_Factory.h
+    AV/QoS_UDP.h
+    AV/RTCP.h
+    AV/RTCP_Channel.h
+    AV/RTCP_Packet.h
+    AV/RTP.h
+    AV/Resource_Factory.h
+    AV/UDP.h
+    AV/default_resource.h
+    AV/global.h
+    AV/md5.h
+    AV/media_timer.h
+    AV/ntp-time.h
+    AV/sfp.h
   }
   Template_Files {
     Channel_Clients_T.cpp
-    AV
+    AV/Endpoint_Strategy_T.cpp
+    AV/Flows_T.cpp
   }
+
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index 390cfa68479..e3cd3a6494d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -6,6 +6,7 @@
 #include "CEC_TypedEventChannel.h"
 #include "CEC_TypedConsumerAdmin.h"
 #include "CEC_DynamicImplementation.h"
+#include "tao/debug.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "CEC_TypedProxyPushConsumer.i"
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
index 6058198ef9e..3775862b315 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -4,6 +4,7 @@
 #define TAO_ESF_SHUTDOWN_PROXY_CPP
 
 #include "ESF_Shutdown_Proxy.h"
+#include "ace/CORBA_macros.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "ESF_Shutdown_Proxy.i"