Reverting mainline changes which broke gcc.

git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/trunk/cpptasks@80 32d7a393-a5a9-423c-abd3-5d954feb1f2f

7 files changed, 4 insertions, 41 deletions

diff --git a/src/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java b/src/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
index a572930..e61bd64 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
+++ b/src/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
@@ -41,7 +41,6 @@ public abstract class AbstractCompiler extends AbstractProcessor
             Compiler {
     private static final String[] emptyIncludeArray = new String[0];
     private String outputSuffix;
-    private static String outputFilePrefix;
     protected AbstractCompiler(String[] sourceExtensions,
             String[] headerExtensions, String outputSuffix) {
         super(sourceExtensions, headerExtensions);
@@ -206,8 +205,4 @@ public abstract class AbstractCompiler extends AbstractProcessor
         }
         return false;
     }
-    
-    public void setOutputFilePrefix(String outputFilePrefix){
-	    this.outputFilePrefix = outputFilePrefix;
-    }
 }
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java b/src/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
index 5b5beaf..9de9491 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
+++ b/src/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
@@ -32,11 +32,8 @@ import org.apache.tools.ant.types.Environment;
  * @author Adam Murdoch
  */
 public abstract class AbstractLinker extends AbstractProcessor
-        implements Linker {
-		
-    protected static String outputFilePrefix = null;
-		
-		
+        implements
+            Linker {
     public AbstractLinker(String[] objExtensions, String[] ignoredExtensions) {
         super(objExtensions, ignoredExtensions);
     }
@@ -67,16 +64,13 @@ public abstract class AbstractLinker extends AbstractProcessor
         }
         return bid;
     }
-    
     public Processor changeEnvironment(boolean newEnvironment, Environment env) {
         return this;
     }
-    
     abstract protected LinkerConfiguration createConfiguration(CCTask task,
             LinkType linkType, ProcessorDef[] baseConfigs,
             LinkerDef specificConfig, TargetDef targetPlatform,
 			VersionInfo versionInfo);
-    
     public ProcessorConfiguration createConfiguration(CCTask task,
             LinkType linkType, ProcessorDef[] baseConfigs,
             ProcessorDef specificConfig,
@@ -88,17 +82,11 @@ public abstract class AbstractLinker extends AbstractProcessor
         return createConfiguration(task, linkType, baseConfigs,
                 (LinkerDef) specificConfig, targetPlatform, versionInfo);
     }
-    
     public String getLibraryKey(File libfile) {
         return libfile.getName();
     }
-    
     public abstract String[] getOutputFileNames(String fileName, VersionInfo versionInfo);
     
-    public void setOutputFilePrefix(String outputFilePrefix){
-	    this.outputFilePrefix = outputFilePrefix;
-	    
-    }
     
     /**
      * Adds source or object files to the bidded fileset to
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
index 2295a5c..38492ea 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
+++ b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
@@ -47,7 +47,6 @@ public final class CommandLineCompilerConfiguration
     private/* final */ProcessorParam[] params;
     private/* final */boolean rebuild;
     private/* final */File[] sysIncludePath;
-    private static String outputFilePrefix;
     public CommandLineCompilerConfiguration(CommandLineCompiler compiler,
             String identifier, File[] includePath, File[] sysIncludePath,
             File[] envIncludePath, String includePathIdentifier, String[] args,
@@ -224,7 +223,4 @@ public final class CommandLineCompilerConfiguration
     public String getCommand() {
     	return compiler.getCommand();
     }
-    public void setOutputFilePrefix(String outputFilePrefix){
-	    this.outputFilePrefix = outputFilePrefix;
-    }
 }
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
index 52b0d67..f9e4761 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
+++ b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
@@ -54,25 +54,17 @@ public abstract class CommandLineLinker extends AbstractLinker
     private boolean newEnvironment = false;
     private String outputSuffix;
 
-    protected String outputPrefix;
-    
-    public void setOutputPrefix(String outputPrefix){
-	this.outputPrefix = outputPrefix;
-    }
-    
-    
 
     /** Creates a comand line linker invocation */
     public CommandLineLinker(String command,
         String identifierArg,
         String[] extensions,
-        String[] ignoredExtensions, String outputPrefix, String outputSuffix,
+        String[] ignoredExtensions, String outputSuffix,
         boolean isLibtool, CommandLineLinker libtoolLinker)
     {
         super(extensions, ignoredExtensions);
         this.command = command;
         this.identifierArg = identifierArg;
-	this.outputPrefix = outputPrefix;
         this.outputSuffix = outputSuffix;
         this.isLibtool = isLibtool;
         this.libtoolLinker = libtoolLinker;
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
index d67ffd3..f0aad67 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
+++ b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
@@ -87,13 +87,8 @@ public final class CommandLineLinkerConfiguration
         return map;
     }
     public String[] getOutputFileNames(String inputFile, VersionInfo versionInfo) {
-	return linker.getOutputFileNames(inputFile, versionInfo);
+        return linker.getOutputFileNames(inputFile, versionInfo);
     }
-    
-    public void setOutputFilePrefix(String outputFilePrefix) {
-	    linker.setOutputFilePrefix(outputFilePrefix);
-    }
-    
     public LinkerParam getParam(String name) {
         for (int i = 0; i < params.length; i++) {
             if (name.equals(params[i].getName()))
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/Linker.java b/src/net/sf/antcontrib/cpptasks/compiler/Linker.java
index 32c29ef..672a0e3 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/Linker.java
+++ b/src/net/sf/antcontrib/cpptasks/compiler/Linker.java
@@ -77,6 +77,4 @@ public interface Linker extends Processor {
 			final boolean isDebug,
 			final File objDir, 
 			final TargetMatcher matcher) throws IOException;
-	
-     public void setOutputFilePrefix(String outputFilePrefix);
 }
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java b/src/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
index c6fe2dc..ff7ac5d 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
+++ b/src/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
@@ -28,7 +28,6 @@ import org.apache.tools.ant.BuildException;
 public interface LinkerConfiguration extends ProcessorConfiguration {
     public LinkerParam getParam(String name);
     void link(CCTask task, TargetInfo linkTarget) throws BuildException;
-    public void setOutputFilePrefix(String outputFilePrefix);
     Linker getLinker();
     boolean isDebug();
 }