only build if the orbsvcs library was built with the Naming TAO_ORBSVCS component

4 files changed, 135 insertions, 96 deletions

diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile
index 302b79eae79..ac450f116d6 100644
--- a/TAO/examples/Simple/bank/Makefile
+++ b/TAO/examples/Simple/bank/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,41 +14,46 @@ endif
 
 LDLIBS = -lorbsvcs -lTAO
 
-IDL_SRC	= BankC.cpp BankS.cpp
+IDL_SRC = BankC.cpp BankS.cpp
 
 PROG_SRCS = \
-	client.cpp \
-	server.cpp \
-	Account_i.cpp \
-	AccountManager_i.cpp \
-	Bank_Client_i.cpp\
-	../Simple_util.cpp
-	
+        client.cpp \
+        server.cpp \
+        Account_i.cpp \
+        AccountManager_i.cpp \
+        Bank_Client_i.cpp\
+        ../Simple_util.cpp
 
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = \
-		BankC.o \
-		BankS.o \
-		client.o \
-		../Simple_util.o \
-		Bank_Client_i.o
+                BankC.o \
+                BankS.o \
+                client.o \
+                ../Simple_util.o \
+                Bank_Client_i.o
 SIMPLE_SVR_OBJS = \
-		BankC.o \
-		BankS.o \
-		Account_i.o \
-		AccountManager_i.o \
-		../Simple_util.o \
-		server.o
+                BankC.o \
+                BankS.o \
+                Account_i.o \
+                AccountManager_i.o \
+                ../Simple_util.o \
+                server.o
 
-BIN = server \
-      client
-BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
+
+BIN2 = server \
+       client
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Naming
 
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -60,7 +65,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#	Local targets
+#       Local targets
 #----------------------------------------------------------------------------
 
 
@@ -71,14 +76,18 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 .PRECIOUS: BankS.cpp BankS.i BankS.h
 .PRECIOUS: BankS_T.cpp BankS_T.i BankS_T.h
 
-server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf BankC.* BankS.* BankS_T.*
+	-$(RM) BankC.* BankS.* BankS_T.*
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile
index 9a974136eba..2fb6f7c6b47 100644
--- a/TAO/examples/Simple/echo/Makefile
+++ b/TAO/examples/Simple/echo/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,38 +14,44 @@ endif # ! TAO_ROOT
 
 LDLIBS = -lTAO -lorbsvcs
 
-IDL_SRC	= EchoC.cpp EchoS.cpp
+IDL_SRC = EchoC.cpp EchoS.cpp
 
 PROG_SRCS = \
-	client.cpp \
-	server.cpp \
-	Echo_i.cpp \
+        client.cpp \
+        server.cpp \
+        Echo_i.cpp \
         Echo_Client_i.cpp \
         ../Simple_util.cpp
 
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = \
-		EchoC.o \
-		EchoS.o \
+                EchoC.o \
+                EchoS.o \
                 Echo_Client_i.o \
-        	../Simple_util.o \
-		client.o
+                ../Simple_util.o \
+                client.o
 SIMPLE_SVR_OBJS = \
-		EchoC.o \
-		EchoS.o \
-		Echo_i.o \
-        	../Simple_util.o \
-		server.o
+                EchoC.o \
+                EchoS.o \
+                Echo_i.o \
+                ../Simple_util.o \
+                server.o
 
-BIN = server \
-      client
-BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
+
+BIN2 = server \
+       client
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Naming
 
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -57,7 +63,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#	Local targets
+#       Local targets
 #----------------------------------------------------------------------------
 
 LDFLAGS +=  -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
@@ -67,14 +73,18 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 .PRECIOUS: EchoS.cpp EchoS.i EchoS.h
 .PRECIOUS: EchoS_T.cpp EchoS_T.i EchoS_T.h
 
-server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf EchoC.* EchoS.* EchoS_T.*
+	-$(RM) -rf EchoC.* EchoS.* EchoS_T.*
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile
index 7c4312cfd00..2bcdf11ec37 100644
--- a/TAO/examples/Simple/grid/Makefile
+++ b/TAO/examples/Simple/grid/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,38 +14,44 @@ endif
 
 LDLIBS = -lorbsvcs -lTAO
 
-IDL_SRC	= GridC.cpp GridS.cpp
+IDL_SRC = GridC.cpp GridS.cpp
 
 PROG_SRCS = \
-	client.cpp \
-	server.cpp \
-	Grid_i.cpp \
+        client.cpp \
+        server.cpp \
+        Grid_i.cpp \
         Grid_Client_i.cpp \
         ../Simple_util.cpp
 
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = \
-		GridC.o \
-		GridS.o \
-		client.o \
+                GridC.o \
+                GridS.o \
+                client.o \
                 ../Simple_util.o \
-                Grid_Client_i.o 
+                Grid_Client_i.o
 SIMPLE_SVR_OBJS = \
-		GridC.o \
-		GridS.o \
-		Grid_i.o \
-		server.o \
+                GridC.o \
+                GridS.o \
+                Grid_i.o \
+                server.o \
                 ../Simple_util.o
 
-BIN = server \
-      client
-BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
+
+BIN2 = server \
+       client
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Naming
 
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -57,7 +63,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#	Local targets
+#       Local targets
 #----------------------------------------------------------------------------
 
 
@@ -68,14 +74,18 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 .PRECIOUS: GridS.cpp GridS.i GridS.h
 .PRECIOUS: GridS_T.cpp GridS_T.i GridS_T.h
 
-server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf GridC.* GridS.* GridS_T.*
+	-$(RM) GridC.* GridS.* GridS_T.*
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile
index 29da88e9d29..723c25ddddf 100644
--- a/TAO/examples/Simple/time/Makefile
+++ b/TAO/examples/Simple/time/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,38 +14,44 @@ endif
 
 LDLIBS = -lorbsvcs -lTAO
 
-IDL_SRC	= TimeC.cpp TimeS.cpp
+IDL_SRC = TimeC.cpp TimeS.cpp
 
 PROG_SRCS = \
-	client.cpp \
-	server.cpp \
-	Time_i.cpp \
+        client.cpp \
+        server.cpp \
+        Time_i.cpp \
         Time_Client_i.cpp \
         ../Simple_util.cpp
 
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = \
-		TimeC.o \
-		TimeS.o \
-		client.o \
+                TimeC.o \
+                TimeS.o \
+                client.o \
                 ../Simple_util.o \
-                Time_Client_i.o 
+                Time_Client_i.o
 SIMPLE_SVR_OBJS = \
-		TimeC.o \
-		TimeS.o \
-		Time_i.o \
-		server.o \
+                TimeC.o \
+                TimeS.o \
+                Time_i.o \
+                server.o \
                 ../Simple_util.o
 
-BIN = server \
-      client
-BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
+
+BIN2 = server \
+       client
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Naming
 
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -57,7 +63,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#	Local targets
+#       Local targets
 #----------------------------------------------------------------------------
 
 
@@ -68,14 +74,18 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 .PRECIOUS: TimeS.cpp TimeS.i TimeS.h
 .PRECIOUS: TimeS_T.cpp TimeS_T.i TimeS_T.h
 
-server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-/bin/rm -rf TimeC.* TimeS.* TimeS_T.*
+	-$(RM) -rf TimeC.* TimeS.* TimeS_T.*
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.