diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-05 05:42:21 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-05 05:42:21 +0000 |
| commit | e0bac2912e79f482bbe4aac964b740e353f3c0e1 (patch) | |
| tree | ede2e0b5e29e425f1d2c668c5e732fa9e4e26b50 | |
| parent | 22f497cfe80cfe109f523619a6945dbabc0208fd (diff) | |
| download | ATCD-e0bac2912e79f482bbe4aac964b740e353f3c0e1.tar.gz | |
ChangeLogTag:Thu Feb 5 05:35:35 UTC 2004 Don Hinton <dhinton@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 14 | ||||
| -rw-r--r-- | TAO/rules.tao.GNU | 8 |
2 files changed, 18 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b66ee3e1f74..6eeed065082 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Thu Feb 5 05:35:35 UTC 2004 Don Hinton <dhinton@dre.vanderbilt.edu> + + * rules.tao.GNU: + Added a new variable, VTAO_IDLFLAGS, and assign $(TAO_IDLFLAGS) + to it. Then use VTAO_IDLFLAGS when invoking the TAO_IDL + compiler. This is needed to avoid a problem where users + "override" TAO_IDLFLAGS in their own makefiles. Once you + override a variable, all subsequent assignments must use + "override" too, or they are ignored. Many Makefile throughout + TAO make assignments to TAO_IDLFLAGS, as well as many users, so + adding "override" has the potential of breaking lots of code. + This change is needed so that -I$(TAO_ROOT) to TAO_IDLFLAGS + without breaking user makefiles that override it. + Wed Feb 4 18:29:32 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * rules.tao.GNU: diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU index 1b77ca96efb..00c14c568e2 100644 --- a/TAO/rules.tao.GNU +++ b/TAO/rules.tao.GNU @@ -167,8 +167,8 @@ ifneq ($(TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS),) endif # TAO_IDLFLAGS should include $TAO_ROOT by default -TAO_IDLFLAGS += -I$(TAO_ROOT) -TAO_IDLFLAGS += \ +VTAO_IDLFLAGS += $(TAO_IDLFLAGS) -I$(TAO_ROOT) +VTAO_IDLFLAGS += \ $(TAO_LACKS_EVENT_CHANNEL_ANY) \ $(TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE) \ $(TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS) @@ -205,7 +205,7 @@ $(foreach ext, $(IDL_EXT_MINUS), %$(ext)): %$(IDL_CLIENT_HDR_EXT) # Invoke the idl compiler to create the client header ifneq ($(tao_dont_use_idl_make_rule),1) %C.h: %.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $< + $(TAO_IDL) $(VTAO_IDLFLAGS) $< endif $(foreach ext, $(IDL_EXT2_MINUS), %$(ext)): %Cli.h @@ -213,7 +213,7 @@ $(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) $< + $(TAO_IDL) $(VTAO_IDLFLAGS) $< endif # Turn on symbol versioning. The scheme that we follow is to allow |