10 files changed, 68 insertions, 12 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile
index 7adef763dcd..45ab94e6cf3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile
@@ -31,9 +31,11 @@ include $(TAO_ROOT)/rules.tao.GNU
 
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (ImplRepo,$(findstring ImplRepo,$(TAO_ORBSVCS)))
-ifeq ($(minimum_corba),0)
-  BIN = $(BIN_UNCHECKED)
-endif # minimum_corba
+  ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
+    ifeq ($(minimum_corba),0)
+      BIN = $(BIN_UNCHECKED)
+    endif # minimum_corba
+  endif #Naming
 endif # ImplRepo
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile b/TAO/orbsvcs/tests/Notify/Blocking/Makefile
index ce9db54242a..e9d2e864ac0 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-BIN = Structured_Supplier Structured_Consumer
+BIN2 = Structured_Supplier Structured_Consumer
 
 IDL_FILES = go
 IDL_SRC = goC.cpp goS.cpp
@@ -29,6 +29,12 @@ SRC = Structured_Supplier.cpp \
 
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
 TAO_IDLFLAGS += -Ge 1
+
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Notify
+
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile b/TAO/orbsvcs/tests/Notify/Discarding/Makefile
index 008284f3bda..e607292096e 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-BIN = Structured_Supplier Structured_Consumer \
+BIN2 = Structured_Supplier Structured_Consumer \
       Sequence_Supplier Sequence_Consumer
 
 IDL_FILES = go
@@ -37,6 +37,13 @@ SRC = Structured_Supplier.cpp \
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
 
 TAO_IDLFLAGS += -Ge 1
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Notify
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
index 924759b84dc..a806cb596de 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-BIN = Structured_Supplier Structured_Consumer
+BIN2 = Structured_Supplier Structured_Consumer
 
 IDL_FILES = go
 IDL_SRC = goC.cpp goS.cpp
@@ -30,6 +30,13 @@ SRC = Structured_Supplier.cpp \
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
 
 TAO_IDLFLAGS += -Ge 1
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Notify
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile b/TAO/orbsvcs/tests/Notify/Ordering/Makefile
index 825fdc3cca6..0275a978963 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-BIN = Structured_Supplier Structured_Consumer \
+BIN2 = Structured_Supplier Structured_Consumer \
       Sequence_Supplier Sequence_Consumer
 
 IDL_FILES = go
@@ -37,6 +37,13 @@ SRC = Structured_Supplier.cpp \
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
 
 TAO_IDLFLAGS += -Ge 1
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Notify
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
index dad1a3f9710..620aaefc5c8 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-BIN = Sequence_Supplier Sequence_Consumer
+BIN2 = Sequence_Supplier Sequence_Consumer
 
 IDL_FILES = go
 IDL_SRC = goC.cpp goS.cpp
@@ -28,6 +28,12 @@ SRC = common.cpp $(IDL_SRC) \
 
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
 TAO_IDLFLAGS += -Ge 1
+
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Notify
+
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
index 1e650afc289..25025eb2c30 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-BIN =  Structured_Supplier Structured_Consumer
+BIN2 =  Structured_Supplier Structured_Consumer
 
 IDL_FILES = control
 
@@ -25,6 +25,13 @@ CONSUMER_OBJS = Structured_Consumer.o Notify_Push_Consumer.o controlC.o controlS
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
 
 TAO_IDLFLAGS += -Ge 1
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Notify
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
index b3dac2d7e2d..c30768fe4bc 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-BIN =  Structured_Supplier Structured_Consumer
+BIN2 =  Structured_Supplier Structured_Consumer
 
 IDL_FILES = control
 
@@ -25,6 +25,14 @@ CONSUMER_OBJS = Structured_Consumer.o Notify_Push_Consumer.o controlC.o controlS
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
 
 TAO_IDLFLAGS += -Ge 1
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Notify
+
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile
index b622d48c3d3..69cd049d3ed 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile
+++ b/TAO/orbsvcs/tests/Sched/Makefile
@@ -16,7 +16,7 @@ BIN2 = DynSched_Test
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
+ifeq (RTSched,$(findstring RTSched,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Sched
 
diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile b/TAO/orbsvcs/tests/ior_corbaname/Makefile
index e7fc1f2c498..02b41e7118c 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile
+++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile
@@ -17,7 +17,7 @@ IDL_FILES = corbaname
 LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils $(TAO_SRVR_LIBS)
 
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
-BIN = server client
+BIN2 = server client
 
 SRC = $(addsuffix .cpp, $(BIN) status_i ior_corbaname_client_i) $(IDL_SRC)
 
@@ -25,6 +25,12 @@ SERVER_OBJS = $(addsuffix .o, server status_i) $(IDL_SRC:%.cpp=%.o)
 CLIENT_OBJS = $(addsuffix .o, client ior_corbaname_client_i status_i) $(IDL_SRC:%.cpp=%.o)
 
 TAO_IDLFLAGS += -Ge 1
+
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Naming
+
 #----------------------------------------------------------------------------
 # Include macros and targets
 #----------------------------------------------------------------------------