--- nbproject/project.properties.orig	2011-06-02 10:54:53.846447070 -0400
+++ nbproject/project.properties	2011-06-02 10:56:01.555446966 -0400
@@ -20,13 +20,13 @@ dist.jar=${dist.dir}/jaffl-0.5.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.asm-3.2.jar=lib/asm-3.2.jar
-file.reference.asm-analysis-3.2.jar=lib/asm-analysis-3.2.jar
-file.reference.asm-commons-3.2.jar=lib/asm-commons-3.2.jar
-file.reference.asm-tree-3.2.jar=lib/asm-tree-3.2.jar
-file.reference.asm-util-3.2.jar=lib/asm-util-3.2.jar
-file.reference.asm-xml-3.2.jar=lib/asm-xml-3.2.jar
-file.reference.jffi-complete.jar-1=../jffi/dist/jffi-complete.jar
+file.reference.asm-3.2.jar=build_lib/objectweb-asm_asm.jar
+file.reference.asm-analysis-3.2.jar=build_lib/objectweb-asm_analysisasm-analysis.jar
+file.reference.asm-commons-3.2.jar=build_lib/objectweb-asm_commonsasm.jar
+file.reference.asm-tree-3.2.jar=build_lib/objectweb-asm_treeasm.jar
+file.reference.asm-util-3.2.jar=build_lib/objectweb-asm_utilasm.jar
+file.reference.asm-xml-3.2.jar=build_lib/objectweb-asm_xmlasm-xml.jar
+file.reference.jffi-complete.jar=build_lib/jffi.jar
 includes=**
 jar.compress=true
 javac.classpath=\
@@ -70,8 +70,8 @@ meta.inf.dir=${src.dir}/META-INF
 platform.active=default_platform
 project.jffi=../jffi
 project.jnr-x86asm=../jnr-x86asm
-reference.jffi.jar=${project.jffi}/dist/jffi.jar
-reference.jnr-x86asm.jar=${project.jnr-x86asm}/dist/jnr-x86asm.jar
+reference.jffi.jar=build_lib/jffi.jar
+reference.jnr-x86asm.jar=build_lib/jnr-x86asm.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
--- nbproject/build-impl.xml.orig	2011-06-02 10:56:23.140445510 -0400
+++ nbproject/build-impl.xml	2011-06-02 10:57:10.325446988 -0400
@@ -411,20 +411,6 @@ is divided into following sections:
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-jar.properties}"/>
-            <param location="${project.jffi}" name="call.subproject"/>
-            <param location="${project.jffi}/build.xml" name="call.script"/>
-            <param name="call.target" value="jar"/>
-            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
-        </antcall>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-jar.properties}"/>
-            <param location="${project.jnr-x86asm}" name="call.subproject"/>
-            <param location="${project.jnr-x86asm}/build.xml" name="call.script"/>
-            <param name="call.target" value="jar"/>
-            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
-        </antcall>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
@@ -570,7 +556,6 @@ is divided into following sections:
         <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
             <fileset dir="${build.classes.dir}"/>
             <manifest>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
             </manifest>
         </copylibs>
     </target>