Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 16000)
+++ /trunk/build.xml	(revision 16001)
@@ -96,5 +96,5 @@
                 <include name="**/*.jar"/>
             </fileset>
-            <pathelement path="${dist.jar}"/>
+            <pathelement path="${build.dir}"/>
             <pathelement path="${failureaccess.jar}"/>
             <pathelement path="${guava.jar}"/>
@@ -382,5 +382,5 @@
         </javac>
     </target>
-    <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
+    <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer" unless="compile.notRequired">
         <!-- JOSM -->
         <javac sourcepath="" srcdir="${src.dir}" fork="yes"
@@ -502,5 +502,5 @@
         </sequential>
     </macrodef>
-    <target name="test-compile" depends="test-init,dist">
+    <target name="test-compile" depends="test-init,compile">
         <call-javac testfamily="unit">
             <cp-elements>