summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-07-22 14:27:27 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-07-22 14:27:27 +0000
commitc68934a095b285a229084b6b139414e31a2de08f (patch)
tree9a26463f816482672206bdd5922be3042c02d4a1
parent8c0b89673488c5819220da8cc5deb05e9bae3616 (diff)
downloadATCD-c68934a095b285a229084b6b139414e31a2de08f.tar.gz
Wed Jul 22 14:26:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/IFR_Service/IFR_Service.mpc: Reverted changes to add dependency on mcpp. Thanks for Adam pointing out that this broke one build
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Service.mpc3
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4d6ab5bdc33..85b03d3f0e6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 22 14:26:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/IFR_Service/IFR_Service.mpc:
+ Reverted changes to add dependency on mcpp. Thanks for Adam pointing out
+ that this broke one build
+
Tue Jul 21 11:43:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* be/be_helper.cpp:
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index c5667b34166..bceb8f907a9 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -42,7 +42,7 @@ project(TAO_IFR_BE) : taolib, tao_output, conv_lib, ifr_client, crosscompile, av
}
-project(TAO_IFR_EXE) : aceexe, install, ifr_client, crosscompile, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, mcpp, tao_idl_mcpp {
+project(TAO_IFR_EXE) : aceexe, install, ifr_client, crosscompile, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
after += TAO_IFR_BE TAO_IDL_FE
exename = tao_ifr
libs += TAO_IFR_BE TAO TAO_IDL_FE
@@ -70,6 +70,7 @@ project(TAO_IFR_EXE) : aceexe, install, ifr_client, crosscompile, avoids_minimum
Source_Files {
drv_args.cpp
+ drv_preproc.cpp
tao_idl.cpp
}