2003/02/15 11:43:08

[org.ibex.core.git] / src / org / xwt / plat / GCJ.xml

diff --git a/src/org/xwt/plat/GCJ.xml b/src/org/xwt/plat/GCJ.xml
index 5051f0c..66761d5 100644 (file)
--- a/src/org/xwt/plat/GCJ.xml
+++ b/src/org/xwt/plat/GCJ.xml
@@ -34,11 +34,10 @@
             <srcfile/>
             <arg value='-o'/>
             <targetfile/>
-            <fileset dir='src/'>
+            <fileset dir='src/' includes='${javafiles}'>
                 <include name='org/xwt/*.java'/>
                 <include name='org/xwt/util/*.java'/>
                 <include name='org/xwt/plat/GCJ.java'/>
-                <include name='org/xwt/plat/${subplat}.java'/>
                 <include name='org/bouncycastle/**/*.java'/>
                 <include name='org/mozilla/**/*.java'/>
                 <exclude name='org/xwt/Trap.java'/>
@@ -74,7 +73,7 @@
             <srcfile/>
             <arg value='-o'/>
             <targetfile/>
-            <fileset dir='src/' includes='org/xwt/plat/${subplat}.cc'/>
+            <fileset dir='src/' includes='${ccfiles}'/>
             <mapper type='glob' from='*.cc' to='*-nat.o'/>
         </apply>
                                                                               
@@ -105,7 +104,7 @@
             <arg value='--main=org.xwt.Main'/>
             <arg line='-o bin-${plat}/${binaryname}'/>
             <srcfile/>
-            <arg line='-L${gcc-path}/lib ${linkflags}'/>
+            <arg line='${linkflags}'/>
        </apply>
     </target>