10 files changed, 64 insertions, 17 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index a1bd57f1ae8..57be42611e4 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -4,8 +4,8 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 
 #include "Config_Scheduler.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index abf9af35069..42500375d5b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -11,15 +11,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 
 #include "sched_export.h"
 
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
-#include "orbsvcs/Sched/Strategy_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h"
 #else
-#include "orbsvcs/Sched/Scheduler_Generic.h"
+#include "orbsvcs/orbsvcs/Sched/Scheduler_Generic.h"
 #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */
 
 class TAO_RTSched_Export ACE_Config_Scheduler
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Makefile.am b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
new file mode 100644
index 00000000000..97213c6f2ab
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
@@ -0,0 +1,47 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Scheduling Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Sched.la
+
+libTAO_Sched_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Sched_la_SOURCES = \
+        Config_Scheduler.cpp \
+        DynSched.cpp \
+        Reconfig_Scheduler.cpp \
+        Reconfig_Sched_Utils.cpp \
+        SchedEntry.cpp \
+        Scheduler.cpp \
+        Scheduler_Generic.cpp \
+        Strategy_Scheduler.cpp
+
+noinst_HEADERS = \
+        Config_Scheduler.h \
+        DynSched.h \
+        Reconfig_Scheduler.h \
+        Reconfig_Sched_Utils.h \
+        SchedEntry.h \
+        Scheduler.h \
+        Scheduler_Generic.h \
+        Strategy_Scheduler.h
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index f5e75f3118e..9f2597df83f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -22,7 +22,7 @@
 #include "Reconfig_Sched_Utils.h"
 
 
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index 225fa09960e..b407bfaf1db 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -24,8 +24,8 @@
 
 #include "ace/config-all.h"
 
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
 #include "sched_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
index 4e46f2f8a63..98b1e11baa8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
@@ -23,8 +23,8 @@
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/RB_Tree.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
 #include "Reconfig_Sched_Utils.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index a6a16be05f2..debe5809f00 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -19,7 +19,7 @@
 #define TAO_RECONFIG_SCHEDULER_T_C
 
 #include "Reconfig_Scheduler_T.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "ace/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
index 87cf62c1668..0e0a6e2074f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -22,8 +22,8 @@
 #include /**/ "ace/pre.h"
 
 #include "sched_export.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "ace/Containers.h"
 
 //////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 9619eceb420..26d5d0cfba0 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -17,7 +17,7 @@
 // ============================================================================
 
 #include "ace/Sched_Params.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "Scheduler.h"
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index abb37fc6cee..5403d9013c6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -33,8 +33,8 @@
 #include "ace/SString.h"
 #include "ace/Unbounded_Set.h"
 
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
 #include "sched_export.h"
 
 class TAO_RTSched_Export ACE_Scheduler