diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-10-15 07:22:59 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-10-15 07:22:59 +0000 |
| commit | 62c99819c71f3cbccdb756d97e84a561489596eb (patch) | |
| tree | 1b4ccdf0f54dc84bee82916ad253b10d6d2d0b57 /CIAO | |
| parent | cdc4e0c7b3e14b64635383dc416d1612451b1a27 (diff) | |
| download | ATCD-62c99819c71f3cbccdb756d97e84a561489596eb.tar.gz | |
Thu Oct 15 07:23:48 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
* tools/IDL3_to_XMI/IDL3_TO_XMI.mpc:
Use tao_idl_fe
Diffstat (limited to 'CIAO')
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc | 16 | ||||
| -rw-r--r-- | CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc | 16 |
3 files changed, 16 insertions, 22 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 00864eb901e..d0c2c87117f 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 15 07:23:48 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: + * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: + Use tao_idl_fe + Wed Oct 14 07:54:48 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * docs/tutorials/Quoter/Simple/01.html: diff --git a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc index 0ca14095a49..5a53e9b7dc6 100644 --- a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc +++ b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc @@ -1,12 +1,9 @@ // -*- MPC -*- // $Id$ -project(TAO_IDL3_TO_IDL2_BE) : acelib, install, ciao_output, crosscompile { - after += TAO_IDL_FE +project(TAO_IDL3_TO_IDL2_BE) : acelib, install, ciao_output, crosscompile, tao_idl_fe { sharedname = TAO_IDL3_TO_IDL2_BE - libs += TAO_IDL_FE dynamicflags = TAO_IDL3_TO_IDL2_BE_BUILD_DLL - includes += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe // This is necessary for MPC to pull in rules.ciao.GNU includes += $(CIAO_ROOT) @@ -36,14 +33,11 @@ project(TAO_IDL3_TO_IDL2_BE) : acelib, install, ciao_output, crosscompile { } } -project(TAO_IDL3_TO_IDL2_EXE) : aceexe, install, ciao_output, crosscompile, tao_idl_mcpp { - after += TAO_IDL3_TO_IDL2_BE TAO_IDL_FE +project(TAO_IDL3_TO_IDL2_EXE) : aceexe, install, ciao_output, crosscompile, tao_idl_mcpp, tao_idl_fe { + after += TAO_IDL3_TO_IDL2_BE exename = tao_idl3_to_idl2 - libs += TAO_IDL3_TO_IDL2_BE TAO_IDL_FE - includes += . $(TAO_ROOT)/TAO_IDL/include \ - $(TAO_ROOT)/TAO_IDL/fe \ - $(TAO_ROOT) - libpaths += $(TAO_ROOT)/TAO_IDL + libs += TAO_IDL3_TO_IDL2_BE + includes += $(TAO_ROOT) exeout = $(CIAO_ROOT)/bin // Adding a strict ordering dependency with TAO_IDL_EXE. It appears on some systems, there diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc b/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc index af7aec07c6a..3cc01c009b6 100644 --- a/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc +++ b/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc @@ -1,12 +1,9 @@ // -*- MPC -*- // $Id$ -project(CIAO_IDL3_TO_XMI_BE) : acelib, install, ciao_output, crosscompile, ciao_xml_utils { - after += TAO_IDL_FE +project(CIAO_IDL3_TO_XMI_BE) : acelib, install, ciao_output, crosscompile, ciao_xml_utils, tao_idl_fe { sharedname = CIAO_IDL3_TO_XMI_BE - libs += TAO_IDL_FE dynamicflags = CIAO_IDL3_TO_XMI_BUILD_DLL - includes += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe // This is necessary for MPC to pull in rules.ciao.GNU includes += $(CIAO_ROOT) @@ -33,14 +30,11 @@ project(CIAO_IDL3_TO_XMI_BE) : acelib, install, ciao_output, crosscompile, ciao_ } } -project(CIAO_IDL3_TO_XMI_EXE) : aceexe, install, ciao_output, crosscompile, ciao_xml_utils, tao_idl_mcpp, xerces { - after += CIAO_IDL3_TO_XMI_BE TAO_IDL_FE +project(CIAO_IDL3_TO_XMI_EXE) : aceexe, install, ciao_output, crosscompile, ciao_xml_utils, tao_idl_mcpp, xerces, tao_idl_fe { + after += CIAO_IDL3_TO_XMI_BE exename = tao_idl3_to_xmi - libs += CIAO_IDL3_TO_XMI_BE TAO_IDL_FE - includes += . $(TAO_ROOT)/TAO_IDL/include \ - $(TAO_ROOT)/TAO_IDL/fe \ - $(TAO_ROOT) - libpaths += $(TAO_ROOT)/TAO_IDL + libs += CIAO_IDL3_TO_XMI_BE + includes += $(TAO_ROOT) exeout = $(CIAO_ROOT)/bin // Adding a strict ordering dependency with TAO_IDL_EXE. It appears on some systems, there |