From 21bce066fdf28a753732990f16e4f9a27538dbeb Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Fri, 25 Apr 2008 20:08:04 +0000
Subject: [PATCH] Doug's attempt at fixing source build.

---
 .../build.properties                          |  6 ++---
 .../org.eclipse.cdt.sdk-feature/feature.xml   | 24 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/releng/org.eclipse.cdt.sdk-feature/build.properties b/releng/org.eclipse.cdt.sdk-feature/build.properties
index 8b09e58d4e1..8fb4210f175 100644
--- a/releng/org.eclipse.cdt.sdk-feature/build.properties
+++ b/releng/org.eclipse.cdt.sdk-feature/build.properties
@@ -14,6 +14,6 @@ bin.includes = feature.xml,\
                license.html,\
                epl-v10.html
                
-generate.feature@org.eclipse.cdt.platform.source=org.eclipse.cdt.platform
-generate.feature@org.eclipse.cdt.gnu.build.source=org.eclipse.cdt.gnu.build
-generate.feature@org.eclipse.cdt.gnu.debug.source=org.eclipse.cdt.gnu.debug
+generate.plugin@org.eclipse.cdt.platform.source=org.eclipse.cdt.platform
+generate.plugin@org.eclipse.cdt.gnu.build.source=org.eclipse.cdt.gnu.build
+generate.plugin@org.eclipse.cdt.gnu.debug.source=org.eclipse.cdt.gnu.debug
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index bad1ed1b085..8555d5f83dc 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -21,23 +21,23 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/ganymede"/>
    </url>
 
-   <includes
-         id="org.eclipse.cdt.platform.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.cdt.gnu.build.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.cdt.gnu.debug.source"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
       <import feature="org.eclipse.cdt" version="5.0.0" match="compatible"/>
    </requires>
 
+   <plugin
+         id="org.eclipse.cdt.platform.source"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.cdt.gnu.build.source"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.cdt.gnu.debug.source"
+         version="0.0.0"/>
+
    <plugin
          id="org.eclipse.cdt.sdk"
          download-size="0"