summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-12 15:05:21 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-12 15:05:21 +0000
commit5220924f8a920a2fb2db915ef3e1c3ef23b429c8 (patch)
tree127c49d19a802470c9790271aa070673b28e02d4 /include
parentc600d247096bfeefc6bf98e9de349c16d42ae7b3 (diff)
downloadATCD-5220924f8a920a2fb2db915ef3e1c3ef23b429c8.tar.gz
ChangeLogTag:Mon Apr 12 10:04:31 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'include')
-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