X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=build.xml;h=66044689e9107215d1579cdde7796c5291def09a;hb=68e3bfbbc1aac7dac3e9c06487047f0377b2b3cd;hp=2ab7104e24a6e9a46397b262e13e303f0ff12203;hpb=7f43eabc54033ee929b618ac0a726a67f860a37b;p=inkscape.git

diff --git a/build.xml b/build.xml
index 2ab7104e2..66044689e 100644
--- a/build.xml
+++ b/build.xml
@@ -230,6 +230,7 @@
     <cxxtestpart command="python ${cxxtest}/cxxtestgen.py" 
                  out="${src}/libnr/test-nr.cpp">
         <fileset dir="${src}/libnr">
+            <include name="nr-compose-test.h"/>
             <include name="nr-types-test.h"/>
             <include name="nr-translate-test.h"/>
             <include name="nr-rotate-test.h"/>
@@ -314,8 +315,6 @@
             <exclude name="libnr/test-nr-main.cpp"/>
             <exclude name="libnr/testnr.cpp"/>
             <exclude name="libnr/in-svg-plane-test.cpp"/>
-            <exclude name="libnr/nr-compose-reference.cpp"/>
-            <exclude name="libnr/nr-compose-test.cpp"/>
             <exclude name="libnr/nr-matrix-test.cpp"/>
             <exclude name="libnr/nr-point-fns-test.cpp"/>
             <exclude name="libnr/nr-rotate-fns-test.cpp"/>
@@ -416,14 +415,15 @@
            <exclude name="winmain.o"/>
            <exclude name="inkview.o"/>
            <!-- CxxTest -->
-           <exclude name="obj/test-main.o"/>
-           <exclude name="obj/test-src.o"/>
-           <exclude name="obj/display/test-display.o"/>
-           <exclude name="obj/helper/test-helper.o"/>
-           <exclude name="obj/libnr/test-nr.o"/>
-           <exclude name="obj/svg/test-svg.o"/>
-           <exclude name="obj/util/test-util.o"/>
-           <exclude name="obj/xml/test-xml.o"/>
+           <exclude name="test-main.o"/>
+           <exclude name="test-src.o"/>
+           <exclude name="display/test-display.o"/>
+           <exclude name="helper/test-helper.o"/>
+           <exclude name="libnr/nr-compose-reference.o"/>
+           <exclude name="libnr/test-nr.o"/>
+           <exclude name="svg/test-svg.o"/>
+           <exclude name="util/test-util.o"/>
+           <exclude name="xml/test-xml.o"/>
        </fileset>
     </staticlib>
   </target>
@@ -573,6 +573,7 @@
            <include name="obj/test-src.o"/>
            <include name="obj/display/test-display.o"/>
            <include name="obj/helper/test-helper.o"/>
+           <include name="obj/libnr/nr-compose-reference.o"/>
            <include name="obj/libnr/test-nr.o"/>
            <include name="obj/svg/test-svg.o"/>
            <include name="obj/util/test-util.o"/>
@@ -712,6 +713,9 @@
 
     # disable images in buttons. i've only seen ugly delphi apps use this feature.
     gtk-button-images = 0
+    
+    # disable the annoying beep in editable controls
+    gtk-error-bell = 0
 
     # enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly.
     # the office apps use them heavily, though.