Remove working file phoebedom.h from tree.

[inkscape.git] / build.xml

diff --git a/build.xml b/build.xml
index 82b9e719dd456e0c5245e569eea3681e7d789eef..432fcdd38241ab6b491369caa00af437105fe98f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -271,6 +271,9 @@
             <exclude name="removeoverlap/remove_rectangle_overlap-test.cpp"/>
             <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
         </fileset>
+        <excludeinc dir="${src}">
+            <file name="extension/param"/>
+        </excludeinc>
         <flags>
             -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
             -O2
@@ -518,7 +521,7 @@
     <copy file="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libgthread-2.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libpoppler-2.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libpoppler-3.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpangoft2-1.0-0.dll" todir="${dist}"/>
@@ -652,7 +655,7 @@
   -->
   <target name="jar" depends="javac"
       description="pack java classes and resources into a jar file">
-    <copy todir="${build}/java/classes"> <fileset dir="${src}/bind/data"/> </copy>
+    <copy todir="${build}/java/classes"> <fileset dir="${gtk}/bind/data"/> </copy>
     <jar basedir="${build}/java/classes" destfile="${build}/java/lib/inkscape.jar"/>
   </target>
 
@@ -663,7 +666,7 @@
   -->
   <target name="binddist" depends="jar"
       description="pack java classes and resources into a jar file">
-    <copy todir="${dist}/share"> <fileset dir="share/bind"/> </copy>
+    <copy todir="${dist}/share/bind"> <fileset dir="${gtk}/bind/java"/> </copy>
     <copy todir="${dist}/share/bind/java"> <fileset dir="${build}/java/lib"/> </copy>
 
   </target>