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

1 files changed, 2 insertions, 14 deletions

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