# HG changeset patch
# User wpaul
# Date 1249930971 18000
# Node ID 9dbd1c22938d8aa7f9bf26bc242cf90e23327716
# Parent  d905e81b9a2efa1e2c95f024797470dd3416a3d8# Parent  c400a1d2216ab1709b25022449e43b7e8bf0e675
merged

diff -r c400a1d2216a -r 9dbd1c22938d cdt/cdt_6_0_x/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java	Mon Aug 10 13:37:15 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java	Mon Aug 10 14:02:51 2009 -0500
@@ -10,14 +10,10 @@
  *******************************************************************************/
 package org.eclipse.cdt.make.internal.core.makefile.gnu;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -38,7 +34,6 @@
 import org.eclipse.cdt.make.internal.core.makefile.EmptyLine;
 import org.eclipse.cdt.make.internal.core.makefile.IgnoreRule;
 import org.eclipse.cdt.make.internal.core.makefile.InferenceRule;
-import org.eclipse.cdt.make.internal.core.makefile.MacroDefinition;
 import org.eclipse.cdt.make.internal.core.makefile.MakeFileConstants;
 import org.eclipse.cdt.make.internal.core.makefile.MakefileReader;
 import org.eclipse.cdt.make.internal.core.makefile.PosixRule;
@@ -55,8 +50,6 @@
 import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.URIUtil;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
 
 /**
  * Makefile : ( statement ) *
@@ -80,7 +73,7 @@
 	public static String FILE_SEPARATOR = System.getProperty("file.separator", "/"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	String[] includeDirectories = new String[0];
-	IDirective[] builtins = null;
+	IDirective[] builtins = new IDirective[0];
 	private IMakefileReaderProvider makefileReaderProvider;
 
 	public GNUMakefile() {
@@ -818,30 +811,6 @@
 	 * @see org.eclipse.cdt.make.internal.core.makefile.AbstractMakefile#getBuiltins()
 	 */
 	public IDirective[] getBuiltins() {
-		if (builtins == null) {
-			String location =  "builtin" + File.separator + "gnu.mk"; //$NON-NLS-1$ //$NON-NLS-2$
-			if (MakeCorePlugin.getDefault() != null) {
-				try {
-					InputStream stream = FileLocator.openStream(MakeCorePlugin.getDefault().getBundle(), new Path(location), false);
-					GNUMakefile gnu = new GNUMakefile();
-					URL url = FileLocator.find(MakeCorePlugin.getDefault().getBundle(), new Path(location), null);
-					gnu.parse(url.toURI(), new InputStreamReader(stream));
-					builtins = gnu.getDirectives();
-					for (int i = 0; i < builtins.length; i++) {
-						if (builtins[i] instanceof MacroDefinition) {
-							((MacroDefinition) builtins[i]).setFromDefault(true);
-						}
-					}
-				} catch (IOException e) {
-					MakeCorePlugin.log(e);
-				} catch (URISyntaxException e) {
-					MakeCorePlugin.log(e);
-	            }
-			}
-			if (builtins == null) {
-				builtins = new IDirective[0];
-			}
-		}
 		return builtins;
 	}
 
diff -r c400a1d2216a -r 9dbd1c22938d cdt/cdt_6_0_x/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java	Mon Aug 10 13:37:15 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java	Mon Aug 10 14:02:51 2009 -0500
@@ -10,14 +10,10 @@
  *******************************************************************************/
 package org.eclipse.cdt.make.internal.core.makefile.posix;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 
 import org.eclipse.cdt.make.core.MakeCorePlugin;
 import org.eclipse.cdt.make.core.makefile.IDirective;
@@ -47,8 +43,6 @@
 import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.URIUtil;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
 
 /**
  * Makefile : ( statement ) *
@@ -69,7 +63,7 @@
 
 public class PosixMakefile extends AbstractMakefile {
 
-	IDirective[] builtins = null;
+	IDirective[] builtins = new IDirective[0];
 	private IMakefileReaderProvider makefileReaderProvider;
 
 	public PosixMakefile() {
@@ -234,28 +228,6 @@
 	 * @see org.eclipse.cdt.make.internal.core.makefile.AbstractMakefile#getBuiltins()
 	 */
 	public IDirective[] getBuiltins() {
-		if (builtins == null) {
-			String location =  "builtin" + File.separator + "posix.mk"; //$NON-NLS-1$ //$NON-NLS-2$
-			try {
-				InputStream stream = FileLocator.openStream(MakeCorePlugin.getDefault().getBundle(), new Path(location), false);
-				PosixMakefile posix = new PosixMakefile();
-				URL url = FileLocator.find(MakeCorePlugin.getDefault().getBundle(), new Path(location), null);
-				posix.parse(url.toURI(), new InputStreamReader(stream));
-				builtins = posix.getDirectives();
-				for (int i = 0; i < builtins.length; i++) {
-					if (builtins[i] instanceof MacroDefinition) {
-						((MacroDefinition)builtins[i]).setFromDefault(true);
-					}
-				}
-			} catch (IOException e) {
-				MakeCorePlugin.log(e);
-			} catch (URISyntaxException e) {
-				MakeCorePlugin.log(e);
-            }
-			if (builtins == null) {
-				builtins = new IDirective[0];
-			}
-		}
 		return builtins;
 	}