summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2012-01-23 12:02:56 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2012-01-23 12:02:56 +0000
commit4592ba9681df8cab549324fb035c76b7e8e0164b (patch)
treec937db4ee9a78a98ef545268ac7111d41bbfdd4c
parentcf4c48e9885c02788622815ea61f33c9686c1b6c (diff)
downloadATCD-4592ba9681df8cab549324fb035c76b7e8e0164b.tar.gz
Mon Jan 23 12:02:07 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/MakeProjectCreator/templates/gnu.mpd: Added support for idl3toxmi and idl3toidl2 flags
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/bin/MakeProjectCreator/templates/gnu.mpd8
2 files changed, 12 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index ae706eff947..074e8111b77 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 23 12:02:07 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/MakeProjectCreator/templates/gnu.mpd:
+ Added support for idl3toxmi and idl3toidl2 flags
+
Sun Jan 22 19:41:27 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/Reactor/WFMO_Reactor/APC.cpp:
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
index 33d6bfd2e3c..e10301b9e1a 100644
--- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
@@ -130,12 +130,18 @@ TAO_IDL3_TO_IDL2 = <%tao_idl3_to_idl2%>
<%if(tao_idl3_to_idl2_dep)%>
TAO_IDL3_TO_IDL2_DEP = <%tao_idl3_to_idl2_dep%>$(EXEEXT)
<%endif%>
+<%if(idl3toidl2flags)%>
+TAO_IDL3_TO_IDL2_FLAGS = <%idl3toidl2flags%>
+<%endif%>
<%if(tao_idl3_to_xmi)%>
TAO_IDL3_TO_XMI = <%tao_idl3_to_xmi%>
<%endif%>
<%if(tao_idl3_to_xmi_dep)%>
TAO_IDL3_TO_XMI_DEP = <%tao_idl3_to_xmi_dep%>$(EXEEXT)
<%endif%>
+<%if(idl3toxmiflags)%>
+TAO_IDL3_TO_XMI_FLAGS = <%idl3toxmiflags%>
+<%endif%>
<%if(exename)%>
PRJ_TYPE = rtp
@@ -708,7 +714,7 @@ endif
<%if(idl_files)%>
<%if(contains(idlflags,-DGEN_IDL_MAKE_DEPS))%>
-incremental_depend_idl::
+incremental_depend_idl::
<%foreach(idl_files)%>
@$(RM) $(IDL_DEPENDENCY_FILE<%forcount%>)_idl.old
@cp $(IDL_DEPENDENCY_FILE<%forcount%>) $(IDL_DEPENDENCY_FILE<%forcount%>)_idl.old