Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Daoust2004-11-30 13:55:50 +0000
committerDavid Daoust2004-11-30 13:55:50 +0000
commit10f8612c803cfe9513dfd7a029222575e43cec2a (patch)
treea0c142c0343ef50eb4320d9a272829c3b72b1a0b
parent517ef2ab92d8c637dbb92cdc5767d50d50e3462a (diff)
downloadorg.eclipse.cdt-CDT_2_1_RC4.tar.gz
org.eclipse.cdt-CDT_2_1_RC4.tar.xz
org.eclipse.cdt-CDT_2_1_RC4.zip
This patch adds the following 2 topics:CDT_2_1_RC4
- Tasks -> Work with C or C++ project files -> Converting CDT 2.0 Managed Make Projects - Reference -> Project Properties -> Managed Make File Properties Thanks, Leo
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm3
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm3
-rw-r--r--doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm1
-rw-r--r--doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm3
-rw-r--r--doc/org.eclipse.cdt.doc.user/topics_Reference.xml6
-rw-r--r--doc/org.eclipse.cdt.doc.user/topics_Tasks.xml1
6 files changed, 14 insertions, 3 deletions
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm
index 21087cc0874..09940bf077b 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm
@@ -48,7 +48,8 @@ Configuration Settings area to set a specific category of options.<p><img img sr
<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
<a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
<a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
+<a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a><br>
+<a href="cdt_u_mfile_build.htm">C++ Project Properties, Managed Make File, C/C++ Build</a></p>
<p>
<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm
index 0a034e2b2f7..c707c9921a6 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm
@@ -48,7 +48,8 @@ Customizes the tools and tool options used in your build configuration.
<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
<a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
<a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
+<a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a><br>
+<a href="cdt_u_mfile_tool_settings.htm">C++ Project Properties, Managed Make File, C/C++ Build, Tool Settings</a></p>
<p>
<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm
index a93bd5b4c10..95e3bc8b033 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm
@@ -18,6 +18,7 @@
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_new_make.htm">Creating a makefile</a><br>
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_prvw_hide_files.htm">Hiding files by type in the C/C++ Projects view</a><br>
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_convert_cdt_proj.htm">Converting CDT 1.x Projects</a><br>
+ <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_convert_mbs20_proj.htm">Converting CDT 2.0 Managed Make Projects</a><br>
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_add_custom_persp.htm">Adding Convert to a C/C++ Make Project to the New menu</a><br>
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_discovery.htm">Set Discovery Options</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm
index 5dfdf24921b..176a07e1de5 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm
@@ -41,7 +41,8 @@ See <a href="cdt_t_discovery.htm">Set Discovery Options</a> for details.</p>
<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21"><br>
<a href="cdt_t_add_custom_persp.htm">Adding Convert to a C/C++ Make Project to the New menu</a><br>
-<a href="cdt_t_discovery.htm">Set Discovery Options</a></p>
+<a href="cdt_t_discovery.htm">Set Discovery Options</a><br>
+<a href="cdt_t_convert_mbs20_proj.htm">Converting CDT 2.0 Managed Make Projects </a></p>
<p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index 6c789039747..e4ea7facee8 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -76,6 +76,12 @@
<topic label="Indexer" href="reference/cdt_u_mprop_indexer.htm"/>
<topic label="Project References" href="reference/cdt_u_mprop_ref.htm"/>
</topic>
+ <topic label="Managed Make File Properties" href="reference/cdt_o_mmake_file.htm">
+ <topic label="Info" href="reference/cdt_u_mfile_info.htm"/>
+ <topic label="C/C++ Build" href="reference/cdt_u_mfile_build.htm">
+ <topic label="Tool Settings" href="reference/cdt_u_mfile_tool_settings.htm"/>
+ </topic>
+ </topic>
<topic label="Standard Make Projects" href="reference/cdt_o_smake_proj.htm">
<topic label="Info" href="reference/cdt_u_sprop_info.htm"/>
<topic label="Builders" href="reference/cdt_u_sprop_builders.htm"/>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
index b02ea7fa588..b0899178f96 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
@@ -11,6 +11,7 @@
<topic label="Create a makefile" href="tasks/cdt_t_new_make.htm"/>
<topic label="Hide files of a given type" href="tasks/cdt_t_prvw_hide_files.htm"/>
<topic label="Converting CDT 1.x Projects" href="tasks/cdt_t_convert_cdt_proj.htm"/>
+ <topic label="Converting CDT 2.0 Managed Make Projects" href="tasks/cdt_t_convert_mbs20_proj.htm"/>
<topic label="Adding Convert to a C/C++ Make Project to the New menu" href="tasks/cdt_t_add_custom_persp.htm"/>
<topic label="Set Discovery Options" href="tasks/cdt_t_discovery.htm"/>
</topic>

Back to the top