summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2010-06-18 13:56:26 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2010-06-18 13:56:26 +0000
commit9261d9f8dca0b3d9c0d1c40ff979cc5c746b003d (patch)
treee4351bcc24b008d2772c3995ea683966bf4a025f
parente88b0cfed8842bc47f2c800ba7d768b4cad896aa (diff)
downloadATCD-9261d9f8dca0b3d9c0d1c40ff979cc5c746b003d.tar.gz
Fri Jun 18 13:56:01 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: Remove mcpp.
-rw-r--r--CIAO/ChangeLog7
-rw-r--r--CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc3
-rw-r--r--CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc3
3 files changed, 11 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 7ac2135d746..859b830629f 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 18 13:56:01 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
+
+ * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
+ * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc:
+
+ Remove mcpp.
+
Fri Jun 18 13:43:02 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* examples/Hello/Sender/Sender.idl:
diff --git a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
index 455e76d570e..0a60d718b20 100644
--- a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
+++ b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
@@ -35,7 +35,7 @@ project(TAO_IDL3_TO_IDL2_BE) : acelib, install_lib, ciao_output, tao_idl_fe {
}
}
-project(TAO_IDL3_TO_IDL2_EXE) : aceexe, install, ciao_output, tao_idl_mcpp, tao_idl_fe {
+project(TAO_IDL3_TO_IDL2_EXE) : aceexe, install, ciao_output, tao_idl_fe {
after += TAO_IDL3_TO_IDL2_BE
exename = tao_idl3_to_idl2
libs += TAO_IDL3_TO_IDL2_BE
@@ -59,6 +59,7 @@ project(TAO_IDL3_TO_IDL2_EXE) : aceexe, install, ciao_output, tao_idl_mcpp, tao_
Source_Files {
$(TAO_ROOT)/TAO_IDL/driver/drv_args.cpp
+ $(TAO_ROOT)/TAO_IDL/driver/drv_preproc.cpp
$(TAO_ROOT)/TAO_IDL/tao_idl.cpp
}
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc b/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
index 09d649ebe48..470a5597675 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
@@ -30,7 +30,7 @@ project(CIAO_IDL3_TO_XMI_BE) : acelib, install_lib, ciao_output, ciao_xml_utils,
}
}
-project(CIAO_IDL3_TO_XMI_EXE) : aceexe, install, ciao_output, ciao_xml_utils, tao_idl_mcpp, xerces, tao_idl_fe {
+project(CIAO_IDL3_TO_XMI_EXE) : aceexe, install, ciao_output, ciao_xml_utils, xerces, tao_idl_fe {
after += CIAO_IDL3_TO_XMI_BE
exename = tao_idl3_to_xmi
libs += CIAO_IDL3_TO_XMI_BE
@@ -56,6 +56,7 @@ project(CIAO_IDL3_TO_XMI_EXE) : aceexe, install, ciao_output, ciao_xml_utils, ta
Source_Files {
$(TAO_ROOT)/TAO_IDL/driver/drv_args.cpp
+ $(TAO_ROOT)/TAO_IDL/driver/drv_preproc.cpp
$(TAO_ROOT)/TAO_IDL/tao_idl.cpp
}