diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-12 15:05:21 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-12 15:05:21 +0000 |
| commit | 5220924f8a920a2fb2db915ef3e1c3ef23b429c8 (patch) | |
| tree | 127c49d19a802470c9790271aa070673b28e02d4 | |
| parent | c600d247096bfeefc6bf98e9de349c16d42ae7b3 (diff) | |
| download | ATCD-5220924f8a920a2fb2db915ef3e1c3ef23b429c8.tar.gz | |
ChangeLogTag:Mon Apr 12 10:04:31 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 7 | ||||
| -rw-r--r-- | include/makeinclude/rules.local.GNU | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 113bee8d954..c2d31ace6e3 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,10 @@ +Mon Apr 12 10:04:31 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * include/makeinclude/rules.local.GNU: + The default rule to compile .idl files is only enabled if + TAO_ROOT is not defined, otherwise we should use the rule in + $TAO_ROOT/rules.tao.GNU + Mon Apr 12 00:18:23 1999 Douglas C. Schmidt <schmidt@cs.wustl.edu> * ACE version 4.6.36 released. 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 |