Made changes to support a prefix for output libraries. Previously lib would be prepended to dynamic libraries by default. This is still the default behavior but now it can be overridded by specifying outputFilePrefix="<some value>" in the cc task.addPrefixParameter@78

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

1 files changed, 13 insertions, 6 deletions

diff --git a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
index a210e7e..1465198 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
+++ b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
@@ -33,14 +33,14 @@ import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
  * @author Curt Arnold
  */
 public abstract class AbstractLdLinker extends CommandLineLinker {
-    private String outputPrefix;
+
+    
     protected AbstractLdLinker(String command, String identifierArg,
             String[] extensions, String[] ignoredExtensions,
             String outputPrefix, String outputSuffix, boolean isLibtool,
             AbstractLdLinker libtoolLinker) {
-        super(command, identifierArg, extensions, ignoredExtensions,
+        super(command, identifierArg, extensions, ignoredExtensions, outputPrefix,
                 outputSuffix, isLibtool, libtoolLinker);
-        this.outputPrefix = outputPrefix;
     }
     public void addBase(long base, Vector args) {
             if (base >= 0) {
@@ -235,12 +235,19 @@ public abstract class AbstractLdLinker extends CommandLineLinker {
     public int getMaximumCommandLength() {
         return Integer.MAX_VALUE;
     }
+    
+    
     public String[] getOutputFileNames(String baseName, VersionInfo versionInfo) {
             String[] baseNames = super.getOutputFileNames(baseName, versionInfo);
-            if (outputPrefix.length() > 0) {
+	    String currentOutputPrefix = "";
+	    if(null != outputFilePrefix)
+		    currentOutputPrefix = outputFilePrefix;
+	    else 
+		     currentOutputPrefix = outputPrefix;
+	    if (outputPrefix.length() > 0) {
                     for(int i = 0; i < baseNames.length; i++) {
-                            baseNames[i] = outputPrefix + baseNames[i];
-                    }
+                            baseNames[i] = currentOutputPrefix + baseNames[i];
+		    }
             }
         return baseNames;
     }