ChangeLogTag: Wed Nov 15 04:00:22 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

4 files changed, 102 insertions, 127 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a454ccf4f10..b87bcc70aab 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Nov 15 04:00:22 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
+        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
+        * examples/RTScheduling/Makefile.am:
+
+          Regenerated.
+
 Wed Nov 15 02:04:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * tao/Makefile.am:
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
index 02f7e2b37af..8a5c656f75f 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
 ## Makefile.Fixed_Priority_Scheduler_Starter.am
 
 if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
 
 noinst_PROGRAMS += Starter
 
@@ -35,25 +34,16 @@ Starter_CPPFLAGS = \
 
 Starter_SOURCES = \
   ../Starter.cpp \
-  ../Synch_i.cpp \
-  ../Starter.h \
-  ../Synch_i.h
+  ../Starter.h
 
 Starter_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libSynch.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_RT_CORBA
 endif BUILD_EXCEPTIONS
 
 ## Makefile.Fixed_Priority_Scheduler_Test.am
@@ -64,28 +54,18 @@ if BUILD_RT_CORBA
 BUILT_SOURCES = \
   ../FP_SchedulingC.cpp \
   ../FP_SchedulingC.h \
-  ../FP_SchedulingC.inl \
-  ../FP_SchedulingS.h \
-  ../FP_SchedulingS.inl \
-  ../FP_SchedulingS_T.cpp \
-  ../FP_SchedulingS_T.h \
-  ../FP_SchedulingS_T.inl
+  ../FP_SchedulingC.inl
 
 CLEANFILES = \
   ../FP_Scheduling-stamp \
   ../FP_SchedulingC.cpp \
   ../FP_SchedulingC.h \
-  ../FP_SchedulingC.inl \
-  ../FP_SchedulingS.h \
-  ../FP_SchedulingS.inl \
-  ../FP_SchedulingS_T.cpp \
-  ../FP_SchedulingS_T.h \
-  ../FP_SchedulingS_T.inl
+  ../FP_SchedulingC.inl
 
-../FP_SchedulingC.cpp ../FP_SchedulingC.h ../FP_SchedulingC.inl ../FP_SchedulingS.h ../FP_SchedulingS.inl ../FP_SchedulingS_T.cpp ../FP_SchedulingS_T.h ../FP_SchedulingS_T.inl: ../FP_Scheduling-stamp
+../FP_SchedulingC.cpp ../FP_SchedulingC.h ../FP_SchedulingC.inl: ../FP_Scheduling-stamp
 
 ../FP_Scheduling-stamp: $(srcdir)/../FP_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../FP_Scheduling.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -SS -St -o .. $(srcdir)/../FP_Scheduling.idl
 	@touch $@
 
 noinst_PROGRAMS += test
@@ -99,38 +79,23 @@ test_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 test_SOURCES = \
-  ../DT_Creator.cpp \
   ../FP_SchedulingC.cpp \
-  ../Job_i.cpp \
-  ../POA_Holder.cpp \
-  ../Synch_i.cpp \
-  ../Task_Stats.cpp \
-  ../Thread_Task.cpp \
   FP_DT_Creator.cpp \
   FP_Scheduler.cpp \
   FP_Task.cpp \
   test.cpp \
-  ../DT_Creator.h \
   ../FP_SchedulingC.h \
   ../FP_SchedulingC.inl \
-  ../FP_SchedulingS.h \
-  ../FP_SchedulingS.inl \
-  ../FP_SchedulingS_T.h \
-  ../FP_SchedulingS_T.inl \
-  ../Job_i.h \
-  ../POA_Holder.h \
-  ../Synch_i.h \
-  ../Task_Stats.h \
-  ../Task_Stats.inl \
-  ../Thread_Task.h \
   FP_DT_Creator.h \
   FP_Scheduler.h \
   FP_Task.h \
+  fp_dt_creator_export.h \
   test.h
 
 test_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libSynch.la \
+  $(top_builddir)/examples/RTScheduling/libRTSchedTestLib.la \
   $(top_builddir)/examples/RTScheduling/libJob.la \
+  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am
index 952afc0991e..bc663a92bfc 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
 ## Makefile.MIF_Scheduler_Starter.am
 
 if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
 
 noinst_PROGRAMS += Starter
 
@@ -35,25 +34,16 @@ Starter_CPPFLAGS = \
 
 Starter_SOURCES = \
   ../Starter.cpp \
-  ../Synch_i.cpp \
-  ../Starter.h \
-  ../Synch_i.h
+  ../Starter.h
 
 Starter_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libSynch.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_RT_CORBA
 endif BUILD_EXCEPTIONS
 
 ## Makefile.MIF_Scheduler_Test.am
@@ -64,28 +54,18 @@ if BUILD_RT_CORBA
 BUILT_SOURCES = \
   ../MIF_SchedulingC.cpp \
   ../MIF_SchedulingC.h \
-  ../MIF_SchedulingC.inl \
-  ../MIF_SchedulingS.h \
-  ../MIF_SchedulingS.inl \
-  ../MIF_SchedulingS_T.cpp \
-  ../MIF_SchedulingS_T.h \
-  ../MIF_SchedulingS_T.inl
+  ../MIF_SchedulingC.inl
 
 CLEANFILES = \
   ../MIF_Scheduling-stamp \
   ../MIF_SchedulingC.cpp \
   ../MIF_SchedulingC.h \
-  ../MIF_SchedulingC.inl \
-  ../MIF_SchedulingS.h \
-  ../MIF_SchedulingS.inl \
-  ../MIF_SchedulingS_T.cpp \
-  ../MIF_SchedulingS_T.h \
-  ../MIF_SchedulingS_T.inl
+  ../MIF_SchedulingC.inl
 
-../MIF_SchedulingC.cpp ../MIF_SchedulingC.h ../MIF_SchedulingC.inl ../MIF_SchedulingS.h ../MIF_SchedulingS.inl ../MIF_SchedulingS_T.cpp ../MIF_SchedulingS_T.h ../MIF_SchedulingS_T.inl: ../MIF_Scheduling-stamp
+../MIF_SchedulingC.cpp ../MIF_SchedulingC.h ../MIF_SchedulingC.inl: ../MIF_Scheduling-stamp
 
 ../MIF_Scheduling-stamp: $(srcdir)/../MIF_Scheduling.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../MIF_Scheduling.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -SS -St -o .. $(srcdir)/../MIF_Scheduling.idl
 	@touch $@
 
 noinst_PROGRAMS += test
@@ -99,38 +79,23 @@ test_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 test_SOURCES = \
-  ../DT_Creator.cpp \
-  ../Job_i.cpp \
   ../MIF_SchedulingC.cpp \
-  ../POA_Holder.cpp \
-  ../Synch_i.cpp \
-  ../Task_Stats.cpp \
-  ../Thread_Task.cpp \
   MIF_DT_Creator.cpp \
   MIF_Scheduler.cpp \
   MIF_Task.cpp \
   test.cpp \
-  ../DT_Creator.h \
-  ../Job_i.h \
   ../MIF_SchedulingC.h \
   ../MIF_SchedulingC.inl \
-  ../MIF_SchedulingS.h \
-  ../MIF_SchedulingS.inl \
-  ../MIF_SchedulingS_T.h \
-  ../MIF_SchedulingS_T.inl \
-  ../POA_Holder.h \
-  ../Synch_i.h \
-  ../Task_Stats.h \
-  ../Task_Stats.inl \
-  ../Thread_Task.h \
   MIF_DT_Creator.h \
   MIF_Scheduler.h \
   MIF_Task.h \
+  mif_dt_creator_export.h \
   test.h
 
 test_LDADD = \
-  $(top_builddir)/examples/RTScheduling/libSynch.la \
+  $(top_builddir)/examples/RTScheduling/libRTSchedTestLib.la \
   $(top_builddir)/examples/RTScheduling/libJob.la \
+  $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
diff --git a/TAO/examples/RTScheduling/Makefile.am b/TAO/examples/RTScheduling/Makefile.am
index 230a80c5d81..3ea6b9afc11 100644
--- a/TAO/examples/RTScheduling/Makefile.am
+++ b/TAO/examples/RTScheduling/Makefile.am
@@ -26,6 +26,58 @@ CLEANFILES =
 BUILT_SOURCES =
 noinst_HEADERS =
 
+## Makefile.RTSchedSynch.am
+
+if BUILD_EXCEPTIONS
+
+BUILT_SOURCES += \
+  SynchC.cpp \
+  SynchC.h \
+  SynchC.inl \
+  SynchS.cpp \
+  SynchS.h \
+  SynchS.inl
+
+CLEANFILES += \
+  Synch-stamp \
+  SynchC.cpp \
+  SynchC.h \
+  SynchC.inl \
+  SynchS.cpp \
+  SynchS.h \
+  SynchS.inl
+
+SynchC.cpp SynchC.h SynchC.inl SynchS.cpp SynchS.h SynchS.inl: Synch-stamp
+
+Synch-stamp: $(srcdir)/Synch.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -St -Wb,export_macro=SYNCH_Export -Wb,export_include=synch_export.h $(srcdir)/Synch.idl
+	@touch $@
+
+noinst_LTLIBRARIES += libRTSchedSynch.la
+
+libRTSchedSynch_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DSYNCH_BUILD_DLL
+
+libRTSchedSynch_la_SOURCES = \
+  SynchC.cpp \
+  SynchS.cpp \
+  Synch_i.cpp
+
+noinst_HEADERS += \
+  Synch.idl \
+  SynchC.h \
+  SynchC.inl \
+  SynchS.h \
+  SynchS.inl \
+  Synch_i.h \
+  synch_export.h
+
+endif BUILD_EXCEPTIONS
+
 ## Makefile.Job.am
 
 if BUILD_EXCEPTIONS
@@ -76,54 +128,39 @@ noinst_HEADERS += \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.Synch.am
+## Makefile.RTSchedTestLib.am
 
 if BUILD_EXCEPTIONS
+if BUILD_RT_CORBA
 
-BUILT_SOURCES += \
-  SynchC.cpp \
-  SynchC.h \
-  SynchC.inl \
-  SynchS.cpp \
-  SynchS.h \
-  SynchS.inl
+noinst_LTLIBRARIES += libRTSchedTestLib.la
 
-CLEANFILES += \
-  Synch-stamp \
-  SynchC.cpp \
-  SynchC.h \
-  SynchC.inl \
-  SynchS.cpp \
-  SynchS.h \
-  SynchS.inl
-
-SynchC.cpp SynchC.h SynchC.inl SynchS.cpp SynchS.h SynchS.inl: Synch-stamp
-
-Synch-stamp: $(srcdir)/Synch.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -St -Wb,export_macro=SYNCH_Export -Wb,export_include=synch_export.h $(srcdir)/Synch.idl
-	@touch $@
-
-noinst_LTLIBRARIES += libSynch.la
-
-libSynch_la_CPPFLAGS = \
+libRTSchedTestLib_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -DSYNCH_BUILD_DLL
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DRTSCHEDTESTLIB_BUILD_DLL
 
-libSynch_la_SOURCES = \
-  SynchC.cpp \
-  SynchS.cpp
+libRTSchedTestLib_la_SOURCES = \
+  DT_Creator.cpp \
+  Job_i.cpp \
+  POA_Holder.cpp \
+  Task_Stats.cpp \
+  Thread_Task.cpp
 
 noinst_HEADERS += \
-  Synch.idl \
-  SynchC.h \
-  SynchC.inl \
-  SynchS.h \
-  SynchS.inl \
-  synch_export.h
-
+  DT_Creator.h \
+  Job_i.h \
+  POA_Holder.h \
+  Task_Stats.h \
+  Task_Stats.inl \
+  Thread_Task.h \
+  rtschedtestlib_export.h
+
+endif BUILD_RT_CORBA
 endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.