summaryrefslogtreecommitdiff
path: root/include/makeinclude/rules.local.GNU
diff options
context:
space:
mode:
Diffstat (limited to 'include/makeinclude/rules.local.GNU')
-rw-r--r--include/makeinclude/rules.local.GNU11
1 files changed, 8 insertions, 3 deletions
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index bedec0971b1..3808fc73ca2 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -27,17 +27,22 @@ build.local: $(BUILD)
.SUFFIXES:
.SUFFIXES: .cpp .cc .C .idl $(SUFFIXES)
+ifndef TAO_ROOT
# and here's how to compile C++ files from the IDL file.
# only ONE of these rules will be run at make-time,
+# The rules are only used if TAO_ROOT is not defined to avoid
+# conflicts with a similar rule in TAO.
+
%S.cpp: %.idl
- $(IDL) $(IDLFLAGS) $<
+ $(IDL) --version $(IDLFLAGS) $<
%C.cpp: %.idl
- $(IDL) $(IDLFLAGS) $<
+ $(IDL) --version $(IDLFLAGS) $<
%.hh: %.idl
- $(IDL) $(IDLFLAGS) $<
+ $(IDL) --version $(IDLFLAGS) $<
+endif # TAO_ROOT
# C++ related targets