summaryrefslogtreecommitdiff
path: root/include/makeinclude/component_check.GNU
diff options
context:
space:
mode:
authordhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-11-18 00:24:54 +0000
committerdhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-11-18 00:24:54 +0000
commit2bc8e409f21c78fccaccf746b11b5c7d803065f0 (patch)
tree998b732c2810b925142c13a1a349f1a23705b801 /include/makeinclude/component_check.GNU
parentec0f3d56d4ad783bf3da53e914e6a2f70197e88a (diff)
downloadATCD-2bc8e409f21c78fccaccf746b11b5c7d803065f0.tar.gz
ChangeLogTag:Tue Nov 18 00:35:51 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'include/makeinclude/component_check.GNU')
-rw-r--r--include/makeinclude/component_check.GNU17
1 files changed, 2 insertions, 15 deletions
diff --git a/include/makeinclude/component_check.GNU b/include/makeinclude/component_check.GNU
index 1fe0458475f..e1c8e4cc630 100644
--- a/include/makeinclude/component_check.GNU
+++ b/include/makeinclude/component_check.GNU
@@ -12,25 +12,12 @@ COMPONENT_CHECK_GNU = 1
COMPILE_COMPONENT = 1
# Load all components.
-ALL_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ALL_COMPONENTS := $(ACE_MAKE_OPTIONS)
+ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --tao)
ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --pace)
-# Add commandline optional components.
-ifeq ($(rmcast),1)
- ALL_COMPONENTS += rmcast
-endif
-ifeq ($(qt_reactor),1)
- ALL_COMPONENTS += qt_reactor
-endif
-ifeq ($(ssl),1)
- ALL_COMPONENTS += ssl
-endif
-ifeq ($(shared_libs),1)
- ALL_COMPONENTS += shared_libs
-endif
-
# Filter out all the components that are currently available from the
# list of requirements.
MISSING_COMPONENTS := $(filter-out $(ALL_COMPONENTS), $(REQUIRED_COMPONENTS))