1 files changed, 7 insertions, 20 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.fp_server b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.fp_server
index 4e13bbe8a1b..c96092c4db5 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.fp_server
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.fp_server
@@ -11,7 +11,7 @@
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.fp_server
 DEPENDENCY_FILE = .depend.Makefile.fp_server
-BIN_UNCHECKED   = fp_server
+BIN_UNCHECKED   = server
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
@@ -20,7 +20,7 @@ ifndef CIAO_ROOT
   CIAO_ROOT = $(TAO_ROOT)/CIAO
 endif
 
-TAO_IDL = $(ACE_ROOT)/bin/tao_idl
+TAO_IDL = ../../../../bin/tao_idl
 IDL_FILES = test
 IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext)))
 
@@ -33,7 +33,7 @@ FILES = \
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
-LDLIBS = -lKokyu_DSRT_Schedulers -lKokyu -lTAO_RTCORBA -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO -lACE
+LDLIBS = -lTAO_RTScheduler -lKokyu -lKokyu_DSRT_Schedulers -lTAO_RTCORBA -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO -lACE
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 ## We don't need the ACELIB setting from wrapper_macros.GNU
 ACELIB =
@@ -52,11 +52,7 @@ $(TEMPINCDIR):
 
 endif
 
-ifeq ($(rt_corba),1)
 BIN    = $(BIN_UNCHECKED)
-else
-  all: require_warning
-endif
 
 OBJS   = $(addsuffix .o, $(notdir $(FILES)))
 SRC    = $(addsuffix .cpp, $(FILES))
@@ -76,7 +72,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
-CPPFLAGS     += -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers -I$(ACE_ROOT)/Kokyu -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT)
+CPPFLAGS     += -I../../../tao/RTScheduling -I../../../tao/RTCORBA -I../../../../Kokyu -I../../../examples/Kokyu_dsrt_schedulers -I../../.. -I../../../tao -I../../../..
 ifeq ($(static_libs),1)
   ifneq ($(LIB),)
     CPPFLAGS += -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
@@ -84,18 +80,14 @@ ifeq ($(static_libs),1)
 endif
 
 
-LDFLAGS      += -L$(ACE_ROOT)/lib
+LDFLAGS      += -L../../../examples/Kokyu_dsrt_schedulers -L../../../tao/RTScheduling -L../../../tao/RTCORBA -L../../../tao/PortableServer -L../../../tao/IORInterceptor -L../../../tao/Valuetype -L../../../tao/ObjRefTemplate -L../../../../Kokyu -L../../../tao -L../../../../ace -L../../../../lib
 
 TAO_IDLFLAGS += -Gv -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
-require_warning:
-	@echo This project will not be built due to one of the following missing features:
-	@echo rt_corba
-
-$(ACE_ROOT)/lib:
-	-@mkdir -p "$(ACE_ROOT)/lib"
+../../../../lib:
+	-@mkdir -p "../../../../lib"
 
 
 ADDITIONAL_IDL_TARGETS =
@@ -107,13 +99,8 @@ endif
 
 .PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
 
-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 
 	-$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))