diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-05-29 21:47:57 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-05-29 21:47:57 +0000 |
| commit | 7922f10fdcb98fcbc0e1e423c4d3145cb731a7a2 (patch) | |
| tree | 3c46a243016902f1b97e3e1368452b8e92ae934e | |
| parent | 056ae626c58bcac1c8793bb89bb1df619c4c1003 (diff) | |
| download | ATCD-7922f10fdcb98fcbc0e1e423c4d3145cb731a7a2.tar.gz | |
ChangeLogTag:Thu May 29 16:46:51 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/rules.tao.GNU | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e38e3b9b7ab..67006fa178a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu May 29 16:46:51 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * rules.tao.GNU: Reverted the change "Thu May 29 14:30:57 UTC 2003 + Gary Duzan <gduzan@bbn.com> , Craig Rodrigues + <crodrigu@bbn.com>" since it breaks parallel builds. + Thu May 29 11:12:28 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/ast/ast_decl.cpp: diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU index be5e3244e37..c39bcfe3bbd 100644 --- a/TAO/rules.tao.GNU +++ b/TAO/rules.tao.GNU @@ -185,11 +185,23 @@ IDL_EXT2=Cli.h $(IDL_EXT2_MINUS) .SUFFIXES: $(IDL_EXT) +$(foreach ext, $(IDL_EXT_MINUS), %$(ext)): %$(IDL_CLIENT_HDR_EXT) + @ + ifneq ($(tao_dont_use_idl_make_rule),1) -$(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl $(TAO_IDL_DEP) +%C.h: %.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $< endif +$(foreach ext, $(IDL_EXT2_MINUS), %$(ext)): %Cli.h + @ + +ifneq ($(tao_dont_use_idl_make_rule),1) +%Cli.h: %.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $< +endif + + # Turn on symbol versioning. The scheme that we follow is to allow # applications dependent on libraries, with same version numbers (major, # minor and beta) to run, but applications with dependencies on libraries |