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

1 files changed, 23 insertions, 16 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
index 6e7576c7fcd..23a2744574f 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
@@ -1,33 +1,38 @@
 #----------------------------------------------------------------------------
-#	$Id$
+#       $Id$
 #
-#	Top-level Makefile for the SFP test of the TAO ORB
+#       Top-level Makefile for the SFP test of the TAO ORB
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS     =  -lorbsvcs -lTAO -lACE
+LDLIBS    =  -lorbsvcs -lTAO -lACE
 
-PROG_SRCS =  client.cpp server.cpp 
+PROG_SRCS =  client.cpp server.cpp
 
 LSRC = $(PROG_SRCS)
 
-AVStreams_SERVER_OBJS = server.o 
-AVStreams_CLIENT_OBJS = client.o 
+AVStreams_SERVER_OBJS = server.o
+AVStreams_CLIENT_OBJS = client.o
 
-BIN = client server
-
-BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+#### 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 (AV,$(findstring AV,$(TAO_ORBSVCS)))
+  BIN = client server
+endif # AV
+
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
@@ -48,13 +53,15 @@ server:$(addprefix $(VDIR),$(AVStreams_SERVER_OBJS))
 client:$(addprefix $(VDIR),$(AVStreams_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@@ $^ $(VLDLIBS)
 
-#main: $(addprefix $(VDIR), $(COSPROPERTY_OBJS))	
-#	$(LINK.cc) $(LDFAGS) -o $@@ $^ $(VLDLIBS) 
+#main: $(addprefix $(VDIR), $(COSPROPERTY_OBJS))
+#	$(LINK.cc) $(LDFAGS) -o $@@ $^ $(VLDLIBS)
 
+# realclean: clean
+#	-$(RM)
 
-realclean: clean
-	-/bin/rm -rf 
-
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.