From 9dff7bf5bc8b6d81596f5f29b2686bd4306c4e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 6 Apr 2015 10:22:45 +0200
Subject: [PATCH] build scripts fixes

---
 build_common.xml                  | 7 ++++++-
 libsrc/ffdec_lib/build_common.xml | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build_common.xml b/build_common.xml
index 65f02618e..8f4a717ae 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -73,7 +73,7 @@
         </copy>
     </target>
 
-    <target name="compile">
+    <target name="compile" depends="build_lib">
         <!--<delete dir="${COMPILEDIR}"/>-->        
         <mkdir dir="${COMPILEDIR}"/>
         <javac srcdir="${SOURCEDIR}" destdir="${COMPILEDIR}" includes="**/*.java" target="${TARGETJAVA}" source="${TARGETJAVA}" debug="true"
@@ -91,6 +91,10 @@
         </copy>
     </target>
     
+    <target name="compile_lib">
+        <ant antfile="${CORELIBSCRIPT}" target="compile" inheritAll="false" usenativebasedir="true" />
+    </target>
+    
     <target name="compile-tests">
         <delete dir="${COMPILETESTSDIR}"/>
         <mkdir dir="${COMPILETESTSDIR}"/>
@@ -559,6 +563,7 @@
         <delete dir="${COVERAGEDIR}"/>
         <delete dir="${TESTRESULTSDIR}"/>
         <delete dir="${LOCALESTARGETDIR}"/>
+        <delete dir="${INSTRDIR}"/>
     </target>
     
     <!-- Debug one test method (Netbeans IDE) -->
diff --git a/libsrc/ffdec_lib/build_common.xml b/libsrc/ffdec_lib/build_common.xml
index 15c75e246..df3267b05 100644
--- a/libsrc/ffdec_lib/build_common.xml
+++ b/libsrc/ffdec_lib/build_common.xml
@@ -185,6 +185,7 @@
         <delete dir="${COVERAGEDIR}"/>
         <delete dir="${TESTRESULTSDIR}"/>
         <delete dir="${LOCALESTARGETDIR}"/>
+        <delete dir="${INSTRDIR}"/>
     </target>
     
     <!-- Debug one test method (Netbeans IDE) -->