summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/sfp/Makefile')
-rw-r--r--TAO/orbsvcs/tests/AVStreams/sfp/Makefile15
1 files changed, 7 insertions, 8 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
index 9f72c4e7fc4..23a2744574f 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
@@ -20,20 +20,19 @@ AVStreams_CLIENT_OBJS = client.o
VLDLIBS = $(LDLIBS:%=%$(VAR))
-BIN2 = client server
+#----------------------------------------------------------------------------
+# 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 = $(BIN2)
+ BIN = client server
endif # AV
-#----------------------------------------------------------------------------
-# Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
@@ -41,7 +40,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
ifndef TAO_ROOT
- TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
endif
DCFLAGS = -g