summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2012-01-23 20:12:48 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2012-01-23 20:12:48 +0000
commit90f779908a0dd6610edb63a13be7993e76f73ee8 (patch)
treea8bd08b6b961b81d99e9d704c2970fc3825e0987
parent5c749fe3333aaaee32aef604d57cfaee0b3217dc (diff)
downloadATCD-90f779908a0dd6610edb63a13be7993e76f73ee8.tar.gz
Mon Jan 23 20:12:06 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/taobaseidl3toidl2defaults.mpb: * MPC/config/taoidl3toxmidefaults.mpb: Reverted change below, triggers error in normal build
-rw-r--r--CIAO/ChangeLog6
-rw-r--r--CIAO/MPC/config/taobaseidl3toidl2defaults.mpb1
-rw-r--r--CIAO/MPC/config/taoidl3toxmidefaults.mpb1
3 files changed, 6 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d809fd41dd9..2fe9e7fc22c 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 23 20:12:06 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * MPC/config/taobaseidl3toidl2defaults.mpb:
+ * MPC/config/taoidl3toxmidefaults.mpb:
+ Reverted change below, triggers error in normal build
+
Mon Jan 23 14:35:42 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/taobaseidl3toidl2defaults.mpb:
diff --git a/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb b/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb
index 3c212c2499e..a9a773fb356 100644
--- a/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb
+++ b/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb
@@ -20,5 +20,4 @@ project {
}
after += TAO_IDL3_TO_IDL2_EXE
- idl3toidl2flags += $(TAO_IDL3_TO_IDL2_FLAGS)
}
diff --git a/CIAO/MPC/config/taoidl3toxmidefaults.mpb b/CIAO/MPC/config/taoidl3toxmidefaults.mpb
index fab6521f07f..00c2c5c8752 100644
--- a/CIAO/MPC/config/taoidl3toxmidefaults.mpb
+++ b/CIAO/MPC/config/taoidl3toxmidefaults.mpb
@@ -21,5 +21,4 @@ project : xerces {
after += CIAO_IDL3_TO_XMI_EXE
// This is necessary for MPC to pull in rules.ciao.GNU
includes += $(CIAO_ROOT)
- idl3toxmiflags += $(TAO_IDL3_TO_XMI_FLAGS)
}