summaryrefslogtreecommitdiff
path: root/CIAO
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-07-04 10:44:23 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-07-04 10:44:23 +0000
commit981b90b4738fa5736ea5f69886faff762d803079 (patch)
tree634c42ffc8890f25780095bbe9a11f77e1c6eb93 /CIAO
parent4b0593a8c2268e629e2cc0123d87f8790a6bf831 (diff)
downloadATCD-981b90b4738fa5736ea5f69886faff762d803079.tar.gz
ChangeLogTag: Fri Jul 04 10:43:00 UTC 2008 Simon Massey <sma at prismtech dot com>
Diffstat (limited to 'CIAO')
-rw-r--r--CIAO/ChangeLog7
-rw-r--r--CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc2
2 files changed, 8 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index dc22114ca7f..1835701aab3 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,6 +1,13 @@
+Fri Jul 04 10:43:00 UTC 2008 Simon Massey <sma at prismtech dot com>
+
+ * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
+
+ Remove extrainious character from Will's commit below.
+
Thu Jul 3 19:21:37 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu>
* tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
+
Added a strict ordering dependency with TAO_IDL_EXE, as some builds
appear to have a race between these two, causing some errors.
diff --git a/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc b/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
index b4060302e54..f78261df4d5 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, tao_output, crosscompile {
TAO_IDL3_TO_IDL2_BE_Export.h
}
}
-2
+
project(TAO_IDL3_TO_IDL2_EXE) : aceexe, install, tao_output, crosscompile, tao_idl_mcpp {
after += TAO_IDL3_TO_IDL2_BE TAO_IDL_FE
exename = tao_idl3_to_idl2