summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authormarcelsmit <msmit@remedy.nl>2015-03-25 11:07:56 +0100
committermarcelsmit <msmit@remedy.nl>2015-03-25 11:07:56 +0100
commitc3423eaaca19b754c93f1c9afd7390be0082b5a0 (patch)
treed6672d34764bf022bbb840f7ae9ce4a761c699d5 /TAO
parentf432ac58c737de66cd6a257fe278e0bbc20b465a (diff)
downloadATCD-c3423eaaca19b754c93f1c9afd7390be0082b5a0.tar.gz
Header ouput extension should be optional otherwise the make files
always has an header included. This goes wrong when only an IDL file is created by the R/TAO IDL compiler. * TAO/MPC/config/taobaseidldefaults.mpb:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/MPC/config/taobaseidldefaults.mpb8
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb
index 2bc3e911d88..43848280942 100644
--- a/TAO/MPC/config/taobaseidldefaults.mpb
+++ b/TAO/MPC/config/taobaseidldefaults.mpb
@@ -16,7 +16,10 @@ project: build_files {
libpath = $(ACE_ROOT)/lib
inputext = .idl
keyword idlflags = commandflags
- header_outputext = .h, .hpp, .hxx, .hh
+
+ optional(header_outputext) {
+ commandflags(!-Sch && !-Ssh) = .h, .hpp, .hxx, .hh
+ }
optional(source_pre_extension) {
commandflags(!-Scc) = C
@@ -45,9 +48,6 @@ project: build_files {
}
// Header related options
- optional(header_outputext) {
- commandflags(-SS && !-oS && !-Ssh) += S
- }
optional(header_pre_extension) {
commandflags(!-oS && !-Ssh) += S
}