Fixed build errors

4 files changed, 3 insertions, 323 deletions

diff --git a/TAO/orbsvcs/examples/RtEC/test_driver/Makefile b/TAO/orbsvcs/examples/RtEC/test_driver/Makefile
deleted file mode 100644
index 9dcc19adbe5..00000000000
--- a/TAO/orbsvcs/examples/RtEC/test_driver/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#----------------------------------------------------------------------------
-#       GNU ACE Workspace
-#
-# @file Makefile
-#
-# $Id$
-#
-# This file was automatically generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-#----------------------------------------------------------------------------
-
-
-MAKE_OPTIONS=$(shell echo $(MAKEFLAGS) | sed 's/--unix *//; s/ .*//')
-ifeq ($(findstring k,$(MAKE_OPTIONS)),k)
-  KEEP_GOING = 1
-else
-  KEEP_GOING = 0
-endif
-
-%.tgt0:
-ifeq ($(KEEP_GOING),1)
-	-@$(MAKE) -f Makefile.test_driver_lib -C . $(*);
-else
-	@$(MAKE) -f Makefile.test_driver_lib -C . $(*);
-endif
-%.tgt1: %.tgt0
-ifeq ($(KEEP_GOING),1)
-	-@$(MAKE) -f Makefile.test_driver_app -C . $(*);
-else
-	@$(MAKE) -f Makefile.test_driver_app -C . $(*);
-endif
-
-
-all: all.tgt0 all.tgt1
-
-debug: debug.tgt0 debug.tgt1
-
-profile: profile.tgt0 profile.tgt1
-
-optimize: optimize.tgt0 optimize.tgt1
-
-install: install.tgt0 install.tgt1
-
-deinstall: deinstall.tgt0 deinstall.tgt1
-
-clean: clean.tgt0 clean.tgt1
-
-realclean: realclean.tgt0 realclean.tgt1
-
-clobber: clobber.tgt0 clobber.tgt1
-
-depend: depend.tgt0 depend.tgt1
-
-rcs_info: rcs_info.tgt0 rcs_info.tgt1
-
-idl_stubs: idl_stubs.tgt0 idl_stubs.tgt1
-
-reverseclean: realclean.tgt1 realclean.tgt0
-
diff --git a/TAO/orbsvcs/examples/RtEC/test_driver/Makefile.test_driver_app b/TAO/orbsvcs/examples/RtEC/test_driver/Makefile.test_driver_app
deleted file mode 100644
index 99387d4c505..00000000000
--- a/TAO/orbsvcs/examples/RtEC/test_driver/Makefile.test_driver_app
+++ /dev/null
@@ -1,117 +0,0 @@
-#----------------------------------------------------------------------------
-#       GNU Makefile
-#
-# @file Makefile.test_driver_app
-#
-# $Id$
-#
-# This file was automatically generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-#----------------------------------------------------------------------------
-MAKEFILE         = Makefile.test_driver_app
-DEPENDENCY_FILE  = .depend.Makefile.test_driver_app
-BIN_UNCHECKED    = Test
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-ifndef CIAO_ROOT
-  CIAO_ROOT = $(TAO_ROOT)/CIAO
-endif
-
-FILES = \
-  Test
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-LDLIBS = -lwrappers -lTest_Driver -lACEXML_Parser -lACEXML -lKokyu -ldsui -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_IORTable -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_Messaging -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_ObjRefTemplate -lTAO_Valuetype -lTAO -lACE
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-## We don't need the ACELIB setting from wrapper_macros.GNU
-ACELIB =
-include $(TAO_ROOT)/rules.tao.GNU
-
-# To build multiple executables in the same directory on AIX, it works
-# best to have a template directory per project.
-# The compiler/linker isn't too smart about instantiating templates...
-ifdef TEMPINCDIR
-TEMPINCDIR := $(TEMPINCDIR)/test_driver_app
-
-all: $(TEMPINCDIR)
-
-$(TEMPINCDIR):
-	@-test -d $(TEMPINCDIR) || mkdir -p $(TEMPINCDIR) $(ACE_NUL_STDERR)
-
-endif
-OUTPUT_DIRECTORY = .
-all: $(OUTPUT_DIRECTORY)
-
-$(OUTPUT_DIRECTORY):
-	-@mkdir -p "$(OUTPUT_DIRECTORY)"
-
-
-CURRENT_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (RTSchedEvent, $(findstring RTSchedEvent, $(CURRENT_COMPONENTS)))
-ifeq (Sched, $(findstring Sched, $(CURRENT_COMPONENTS)))
-ifeq (Naming, $(findstring Naming, $(CURRENT_COMPONENTS)))
-ifeq (RTEvent, $(findstring RTEvent, $(CURRENT_COMPONENTS)))
-BIN    = $(BIN_UNCHECKED)
-else
-  all: comp_warning
-endif
-else
-  all: comp_warning
-endif
-else
-  all: comp_warning
-endif
-else
-  all: comp_warning
-endif
-
-OBJS   = $(addsuffix .o, $(notdir $(FILES)))
-SRC    = $(addsuffix .cpp, $(FILES))
-ifneq (,$(RC))
-  FILES += $(RESOURCES)
-endif
-
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-CPPFLAGS     += -I../../../../../ACEXML/common -I../../../../../Kokyu -I$(DATASTREAM_ROOT)/include -I../../../../orbsvcs -I../../../.. -I../../../../tao -I../../../../..
-ifeq ($(static_libs),1)
-  ifneq ($(LIB),)
-    CPPFLAGS += -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-  endif
-endif
-
-
-LDFLAGS      += -L. -L$(DATASTREAM_ROOT)/lib -L../../../../../lib
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-comp_warning:
-	@echo This project will not be built due to one of the following missing components:
-	@echo RTSchedEvent Sched Naming RTEvent
-
-
-ifndef kylix
-$(BIN): $(addprefix $(VDIR), $(OBJS))
-	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
-else
-$(BIN): $(addprefix $(VDIR), $(OBJS))
-	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $(VLDLIBS) $(BORINITEXEOBJ) $(POSTLINK) $^, $@,,
-endif
-
-realclean: clean 
-ifneq ($(GENERATED_DIRTY),)
-	-$(RM) -r $(GENERATED_DIRTY)
-endif
-
diff --git a/TAO/orbsvcs/examples/RtEC/test_driver/Makefile.test_driver_lib b/TAO/orbsvcs/examples/RtEC/test_driver/Makefile.test_driver_lib
deleted file mode 100644
index b101ef577b6..00000000000
--- a/TAO/orbsvcs/examples/RtEC/test_driver/Makefile.test_driver_lib
+++ /dev/null
@@ -1,144 +0,0 @@
-#----------------------------------------------------------------------------
-#       GNU Makefile
-#
-# @file Makefile.test_driver_lib
-#
-# $Id$
-#
-# This file was automatically generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-#----------------------------------------------------------------------------
-MAKEFILE         = Makefile.test_driver_lib
-DEPENDENCY_FILE  = .depend.Makefile.test_driver_lib
-LIB              = libTest_Driver.a
-SHLIB            = libTest_Driver.$(SOEXT)
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-ifndef CIAO_ROOT
-  CIAO_ROOT = $(TAO_ROOT)/CIAO
-endif
-
-FILES = \
-  Consumer \
-  Supplier \
-  TimeoutConsumer \
-  TestConfig \
-  Test_Handler \
-  Config_Factory \
-  Timer_Event_Handler \
-  cpuload \
-  ECConfig_Gateway
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-ACE_SHLIBS = -lACEXML_Parser -lACEXML -lTAO_RTKokyuEvent -lKokyu -ldsui -lTAO_RTSched -lTAO_CosNaming -lTAO_IORTable -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_Messaging -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_ObjRefTemplate -lTAO_Valuetype -lTAO -lACE
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-## We don't need the ACELIB setting from wrapper_macros.GNU
-ACELIB =
-include $(TAO_ROOT)/rules.tao.GNU
-
-# To build multiple executables in the same directory on AIX, it works
-# best to have a template directory per project.
-# The compiler/linker isn't too smart about instantiating templates...
-ifdef TEMPINCDIR
-TEMPINCDIR := $(TEMPINCDIR)/test_driver_lib
-
-all: $(TEMPINCDIR)
-
-$(TEMPINCDIR):
-	@-test -d $(TEMPINCDIR) || mkdir -p $(TEMPINCDIR) $(ACE_NUL_STDERR)
-
-endif
-OUTPUT_DIRECTORY = ../../../../../lib
-all: $(OUTPUT_DIRECTORY)
-
-$(OUTPUT_DIRECTORY):
-	-@mkdir -p "$(OUTPUT_DIRECTORY)"
-
-CURRENT_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Sched, $(findstring Sched, $(CURRENT_COMPONENTS)))
-ifeq (Naming, $(findstring Naming, $(CURRENT_COMPONENTS)))
-ifeq (RTEvent, $(findstring RTEvent, $(CURRENT_COMPONENTS)))
-else
-  LIB   =
-  SHLIB =
-  all: comp_warning
-endif
-else
-  LIB   =
-  SHLIB =
-  all: comp_warning
-endif
-else
-  LIB   =
-  SHLIB =
-  all: comp_warning
-endif
-
-ifeq (,$(TAO_ORBSVCS))
-else
-  ifeq (Sched, $(findstring Sched, $(TAO_ORBSVCS)))
-  ifeq (Naming, $(findstring Naming, $(TAO_ORBSVCS)))
-  ifeq (RTEvent, $(findstring RTEvent, $(TAO_ORBSVCS)))
-  else
-    LIB   =
-    SHLIB =
-  endif
-  else
-    LIB   =
-    SHLIB =
-  endif
-  else
-    LIB   =
-    SHLIB =
-  endif
-endif
-
-ifneq (,$(RC))
-  FILES += $(RESOURCES)
-endif
-
-LSRC   = $(addsuffix .cpp, $(FILES))
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-
-INSTALL_CHECK = ../../../../../lib
-ifeq ($(INSTALL_CHECK),.)
-  INSLIB = $(PWD)
-else
-  INSLIB  = $(INSTALL_CHECK)
-endif
-
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-CPPFLAGS     += -I../../../../../ACEXML/common -I../../../../../Kokyu -I$(DATASTREAM_ROOT)/include -I../../../../orbsvcs -I../../../.. -I../../../../tao -I../../../../..
-ifeq ($(static_libs),1)
-  ifneq ($(LIB),)
-    CPPFLAGS += -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-  endif
-endif
-
-
-LDFLAGS      += -L$(DATASTREAM_ROOT)/lib -L../../../../../lib
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-comp_warning:
-	@echo This project will not be built due to one of the following missing components:
-	@echo Sched Naming RTEvent
-
-
-realclean: clean 
-ifneq ($(GENERATED_DIRTY),)
-	-$(RM) -r $(GENERATED_DIRTY)
-endif
-
diff --git a/TAO/orbsvcs/examples/RtEC/test_driver/test_driver.mpc b/TAO/orbsvcs/examples/RtEC/test_driver/test_driver.mpc
index 26eb427e725..ff0e520c171 100644
--- a/TAO/orbsvcs/examples/RtEC/test_driver/test_driver.mpc
+++ b/TAO/orbsvcs/examples/RtEC/test_driver/test_driver.mpc
@@ -1,4 +1,4 @@
-project(test_driver_lib): orbsvcslib, rtevent, rtsched, rtkokyuevent, kokyu, acexml {
+project(test_driver_lib): orbsvcslib, rtevent, rtsched, rtkokyuevent, rgkokyu, acexml {
   sharedname    = Test_Driver
 
   Source_Files {
@@ -18,11 +18,12 @@ project(test_driver_lib): orbsvcslib, rtevent, rtsched, rtkokyuevent, kokyu, ace
   }
 }
 
-project(test_driver_app): orbsvcsexe, rtevent, rtsched, rtschedevent, kokyu, acexml {
+project(test_driver_app): orbsvcsexe, rtevent, rtsched, rtschedevent, rtrgkokyuevent, rgkokyu, acexml {
   exename = Test
   after += test_driver_lib
   libs += wrappers Test_Driver
   libpaths += .
+  includes += $(TAO_ROOT)/orbsvcs
 
   Source_Files {
     Test.cpp