summaryrefslogtreecommitdiff
path: root/performance-tests/Misc
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-03-10 05:09:53 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-03-10 05:09:53 +0000
commita9f16bbbfec3d07c23d2128131fe8e4fd4c4a0aa (patch)
tree74dfc77489271fee083e680f659e10e846614109 /performance-tests/Misc
parentfe51e3a9068c741c5ae2c17c7ca6696a059eb49e (diff)
downloadATCD-a9f16bbbfec3d07c23d2128131fe8e4fd4c4a0aa.tar.gz
don't build test_naming if ACE_COMPONENTS is defined and doesn't contain Other
Diffstat (limited to 'performance-tests/Misc')
-rw-r--r--performance-tests/Misc/Makefile65
1 files changed, 38 insertions, 27 deletions
diff --git a/performance-tests/Misc/Makefile b/performance-tests/Misc/Makefile
index 4101dbd358e..7d45b05f9fd 100644
--- a/performance-tests/Misc/Makefile
+++ b/performance-tests/Misc/Makefile
@@ -1,53 +1,64 @@
#----------------------------------------------------------------------------
-# $Id$
+# $Id$
#
-# Makefile for tests of the miscellaneous ACE performance tests
+# Makefile for tests of the miscellaneous ACE performance tests
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
-# Local macros
+# Local macros
#----------------------------------------------------------------------------
-BIN = basic_perf \
- childbirth_time \
- context_switch_time \
- preempt \
- test_mutex \
- test_singleton \
- test_naming
+BIN = basic_perf \
+ childbirth_time \
+ context_switch_time \
+ preempt \
+ test_mutex \
+ test_singleton
+#### See below for test_naming.
# Only build static library for optimum run-time speed.
-LIB = libPerf.a
+LIB = libPerf.a
FILES = basic_func
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(addsuffix .o,$(FILES))
-LDLIBS = -lPerf
+LSRC = $(addsuffix .cpp,$(FILES))
+LOBJ = $(addsuffix .o,$(FILES))
+LDLIBS = -lPerf
VLDLIBS = $(LDLIBS:%=%$(VAR))
# See comment above about only building libPerf.a for max performance.
BUILD = $(VLIB) $(VBIN)
-# For make depend.
-PSRC = $(addsuffix .cpp, $(BIN))
-
#----------------------------------------------------------------------------
-# Include macros and targets
+# 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
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+#### If ACE_COMPONENTS is set and doesn't contain Other, don't
+#### try to build test_naming.
+ifdef ACE_COMPONENTS
+ ifeq (,$(findstring Other,$(ACE_COMPONENTS)))
+ BIN+ = test_naming
+ endif # ! Other
+else # ! ACE_COMPONENTS
+ BIN += test_naming
+endif # ! ACE_COMPONENTS
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
#----------------------------------------------------------------------------
-# Local targets
+# Local targets
#----------------------------------------------------------------------------
+# For make depend.
+PSRC = $(addsuffix .cpp, $(BIN))
+
#----------------------------------------------------------------------------
-# Dependencies
+# Dependencies
#----------------------------------------------------------------------------
# DO NOT DELETE THIS LINE -- g++dep uses it.