From: Sebastian <basti@sraa.de>
Date: Mon, 25 Nov 2013 17:46:33 +0000 (+0100)
Subject: aesa, dol: create dol binary path and use it
X-Git-Url: http://sraa.de/git/?a=commitdiff_plain;ds=sidebyside;h=82ca9fb592183dba13541e6e9b9888a3cc0a642a;p=jump.git

aesa, dol: create dol binary path and use it

Make the Ant build file generate the dol.jar file next to the other
jars required for DOL.
Additionally, make the AESA Makefile use this new path.
---

diff --git a/aesa/Makefile b/aesa/Makefile
index 1e52d75..8a25551 100644
--- a/aesa/Makefile
+++ b/aesa/Makefile
@@ -10,7 +10,7 @@ PROGRAM = AESA
 CODEGEN = -C
 
 # change according to your system
-DOLPATH     = $(HOME)/dol/bin
+DOLPATH     = $(HOME)/jump/dol/jars
 SYSTEMC_INC = $(HOME)/systemc/include
 SYSTEMC_LIB = $(HOME)/systemc/lib-linux64/libsystemc.a
 
diff --git a/dol/build.xml b/dol/build.xml
index a47b050..27e1207 100644
--- a/dol/build.xml
+++ b/dol/build.xml
@@ -25,7 +25,7 @@
   <property name="bin.main.dir"  location="${bin.dir}/main"/>
   <property name="doc.api.dir"   location="${doc.dir}/api"/>
   <property name="doc.build.dir" location="${build.dir}/docs"/>
-  <property name="expo.dir"      location="../expo"/>
+  <property name="expo.dir"      location="${basedir}"/>
 
   <!-- distribution directories -->
   <property name="bin-dist.name" value="dol.jar"/>