Fri Mar 2 20:28:27 Angelo Corsaro <angelo@hermes.doc.wustl.edu>

23 files changed, 248 insertions, 24 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 685834e532a..cd9dc79e362 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,42 @@
+Fri Mar  2 20:28:27  Angelo Corsaro  <angelo@hermes.doc.wustl.edu>
+
+	* rules.tao.GNU:
+	* orbsvcs/CosEvent_Service/Makefile:
+	* orbsvcs/Dump_Schedule/Makefile:
+	* orbsvcs/Event_Service/Makefile:
+	* orbsvcs/LifeCycle_Service/Makefile:
+	* orbsvcs/Logging_Service/Makefile:
+	* orbsvcs/Notify_Service/Makefile:
+	* orbsvcs/Scheduling_Service/Makefile:
+	* orbsvcs/tests/AVStreams/benchmark/Makefile:
+	* orbsvcs/tests/CosEvent/Basic/Makefile:
+	* orbsvcs/tests/EC_Basic/Makefile:
+	* orbsvcs/tests/EC_Custom_Marshal/Makefile:
+	* orbsvcs/tests/EC_Multiple/Makefile:
+	* orbsvcs/tests/EC_Throughput/Makefile:
+	* orbsvcs/tests/Event/Basic/Makefile:
+	* orbsvcs/tests/Event/Performance/Makefile:
+	* orbsvcs/tests/Event_Latency/Makefile:
+	* orbsvcs/tests/FaultTolerance/IOGR/Makefile:
+	* orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile:
+	* orbsvcs/tests/Sched/Makefile:
+	* orbsvcs/tests/Trading/Makefile:
+	* orbsvcs/tests/ior_corbaname/Makefile:
+
+	  Added the new macros:
+	      - TAO_DYNAMIC_LIBS
+	      - TAO_COS_NOTIFICATION_LIBS
+	      - TAO_RT_SCHED_LIBS
+	      - TAO_FAULT_TOLERANCE_LIBS
+	      - TAO_COS_TRADING_LIBS
+	    
+	  this macros expand to  multiple libraries on QNX RTP,
+	  and this enable to work around a problem that is present
+	  currently in the QNX linker. For all othe platform these
+	  macro expand to the only library associated to the CORBA
+	  service. With this work aroun all the orbsvcs  and almost 
+	  all the orbsvcs test build.
+	  
 Fri Mar  2 16:16:45 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tao/Object.cpp (operator>>):
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile
index 14fca4a53f7..f04d9b5ce84 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -10,7 +10,15 @@ LSRC = CosEvent_Service.cpp \
 
 ES_OBJS=$(LSRC:.cpp=.o)
 
-LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_CosEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 BIN_UNCHECKED = CosEvent_Service
 
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
index aacaa38298d..1101ac774b0 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile
@@ -10,8 +10,15 @@ SRC = $(DUMP_SRCS)
 SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 DUMP_OBJS = $(DUMP_SRCS:.cpp=.o)
 
-LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE
-
+LDLIBS = -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 BIN2 = Dump_Schedule
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index f7be0fcd7a2..c1fa839f78e 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -7,7 +7,15 @@ endif
 LSRC = Event_Service.cpp
 ES_OBJS=$(LSRC:.cpp=.o)
 
-LDLIBS = -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 BIN2 = Event_Service
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile
index f96fc3802b8..45243b45a4b 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile
@@ -24,7 +24,15 @@ LSRC= \
 LIFECYCLE_SERVICE_OBJS = LifeCycle_Service.o LifeCycle_Service_i.o \
         Factory_Trader.o Criteria_Evaluator.o
 
-LDLIBS = -lTAO_CosLifeCycle -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_CosLifeCycle -lTAO_CosTrading -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 BIN2 = LifeCycle_Service
 
diff --git a/TAO/orbsvcs/Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Makefile
index e88dc691f15..b077f35ffc5 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile
+++ b/TAO/orbsvcs/Logging_Service/Makefile
@@ -10,7 +10,15 @@ LSRC = Logging_Service.cpp
 
 LOG_OBJS=$(LSRC:.cpp=.o)
 
-LDLIBS = -lTAO_DsLogAdmin -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_DsLogAdmin -lTAO_CosTrading -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 BIN2 = Logging_Service
 
diff --git a/TAO/orbsvcs/Notify_Service/Makefile b/TAO/orbsvcs/Notify_Service/Makefile
index 8925f95d63a..1f6ce4533f1 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile
+++ b/TAO/orbsvcs/Notify_Service/Makefile
@@ -6,7 +6,16 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosNotification  -lTAO_CosNaming -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS) 
+LDLIBS+=$(TAO_COS_NOTIFICATION_LIBS)
 
 LSRC = Notify_Service.cpp
 
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index d1f4d94cd4f..fe44fdf5b1e 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -9,7 +9,15 @@ LSRC =  $(SCHEDULE_SRCS)
 
 SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 
-LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTSched  -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 BIN2 = Scheduling_Service
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
index 5a49df845ad..e006612ea59 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
@@ -9,7 +9,15 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 SERVER_OBJS = server.o child.o
 CLIENT_OBJS = client.o
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
index de3ea52e92d..f328c0852da 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
@@ -21,7 +21,16 @@ BIN2 =  \
 	Random
 
 PSRC=$(addsuffix .cpp,$(BIN2))
-LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
+
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/tests/EC_Basic/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile
index acbda02d056..773a233e366 100644
--- a/TAO/orbsvcs/tests/EC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/EC_Basic/Makefile
@@ -1,7 +1,15 @@
 # $Id$
 
 SRC = $(BIN:%=%$(VAR).cpp)
-LDLIBS= -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS= -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index e95f013b839..8d2d2afd963 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -1,6 +1,14 @@
 # $Id$
 
-LDLIBS= -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS= -lTAO_RTEvent -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index 2410208b0d9..0ca4e97657c 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -1,7 +1,15 @@
 # $Id$
 
 SRC = $(BIN:%=%$(VAR).cpp)
-LDLIBS= -lTAO_RTOLDEvent -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS= -lTAO_RTOLDEvent -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 ifndef TAO_ROOT
  TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index e6ffbd0c26a..f0161e3bbd0 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -1,6 +1,14 @@
 # $Id$
 
-LDLIBS = -lTAO_RTOLDEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTOLDEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile
index a9061f6f223..3c95cdbe443 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile
@@ -29,7 +29,16 @@ BIN2 =   Reconnect \
 	Random
 
 PSRC=$(addsuffix .cpp,$(BIN2)) Schedule.cpp
-LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lECTests -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
+
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index 2c0da6ddf45..fc0fc925394 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -19,7 +19,16 @@ BIN2 =  Throughput \
 	Latency_Server
 
 PSRC=$(addsuffix .cpp,$(BIN2))
-LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Strategies -lTAO
+LDLIBS = -lECTests -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Strategies -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
+
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile
index ab2a6c4714e..8078dd87699 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Makefile
+++ b/TAO/orbsvcs/tests/Event_Latency/Makefile
@@ -4,7 +4,15 @@ EVENT_LATENCY_SRCS = Event_Latency.cpp
 LSRC = $(EVENT_LATENCY_SRCS)
 EVENT_LATENCY_OBJS = $(EVENT_LATENCY_SRCS:.cpp=.o)
 
-LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
 
 BIN2 = Event_Latency
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
index 8c1a4fb5678..3bd8a942e8d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
@@ -50,7 +50,16 @@ include $(TAO_ROOT)/taoconfig.mk
 .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
 
 TAO_IOR_MANIP_LIBS = -lTAO_IORManip
-TAO_FT_LIBS = -lTAO_FaultTolerance -lTAO_CosNaming -lTAO_CosNotification -lTAO_Svc_Utils -lTAO_PortableServer
+TAO_FT_LIBS = -lTAO_Svc_Utils -lTAO_PortableServer
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+TAO_FT_LIBS+=$(TAO_COS_NAMING_LIBS) $(TAO_COS_NOTIFICATION_LIBS) $(TAO_FAULT_TOLERANCE_LIBS)
+
 
 server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_FT_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
index 2664bb99ddd..31e015a830d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
@@ -12,7 +12,15 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO_FaultTolerance -lTAO_CosNaming -lTAO_CosNotification -lTAO_IORManip -lTAO
+LDLIBS = -lTAO_IORManip -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS) $(TAO_COS_NOTIFICATION_LIBS) $(TAO_FAULT_TOLERANCE_LIBS)
 
 PROG_SRCS = IOGRTest.cpp
 
diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile
index 985c26a6848..7310e172715 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile
+++ b/TAO/orbsvcs/tests/Sched/Makefile
@@ -1,7 +1,15 @@
 # $Id$
 
 SRC = $(BIN:%=%$(VAR).cpp)
-LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_Svc_Utils -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS) $(TAO_RT_SCHED_LIBS)
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 4711ca6551f..72adcfb7625 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -38,8 +38,16 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
 
 LSRC    = $(addsuffix .cpp,$(FILES)) $(IDL_SRC)
 PSRC    = $(addsuffix .cpp,$(BIN2))
-ACE_SHLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
-LDLIBS  = -lTAO_CosTrading -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+ACE_SHLIBS = -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
+LDLIBS  = -lTAO_CosTrading -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS) $(TAO_COS_TRADING_LIBS)
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile b/TAO/orbsvcs/tests/ior_corbaname/Makefile
index 4218429e8cb..57b607aa472 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile
+++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile
@@ -15,7 +15,16 @@ endif # ! TAO_ROOT
 IDL_FILES = corbaname
 IDL_SRC = corbanameC corbanameS
 
-LDLIBS = -lTAO_PortableServer -lTAO -lTAO_CosNaming
+LDLIBS = -lTAO_PortableServer -lTAO
+#
+# NOTE
+#
+# The following macro expands to a series of libraries
+# on QNX RTP. It has been introduced to solve a problem
+# with the current QNX RTP linker.
+#
+LDLIBS+=$(TAO_COS_NAMING_LIBS)
+
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 BIN = server client
 
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 5a4907d8bb5..95a082fae91 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -40,7 +40,19 @@ endif # COMSPEC
 TAO_BASE_LIBS=-lTAO $(ACELIB) $(LIBS)
 TAO_SRVR_LIBS=-lTAO_PortableServer $(TAO_BASE_LIBS)
 TAO_CLNT_LIBS=-lTAO $(TAO_BASE_LIBS)
-TAO_DYNAMIC_LIBS=-lTAO_DynamicInterface
+#
+# The following simbols has been defined to overcome a 
+# problem with the current QNX RTP linker. In fact for 
+# that platform the relative platform macro file takes 
+# care of adding a number of additional library that are
+# not usually needed on other platforms.
+#
+TAO_DYNAMIC_LIBS+=-lTAO_DynamicInterface
+TAO_COS_NAMING_LIBS+=-lTAO_CosNaming
+TAO_COS_NOTIFICATION_LIBS+=-lTAO_CosNotification
+TAO_RT_SCHED_LIBS+=-lTAO_RTSched
+TAO_FAULT_TOLERANCE_LIBS+=-lTAO_FaultTolerance
+TAO_COS_TRADING_LIBS+=-lTAO_CosTrading
 
 ####
 #### Macro customization.