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 1e52d7569cfe688891e1cc181c9bb1d9c8ce1517..8a25551266f1a09ce721f7db197e1422bbf5ba6b 100644 (file)
--- 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 a47b05019022e8e511dddc7ac31c5e51fa853200..27e1207cb3d96651801efab8ee2520ee8cbb6de8 100644 (file)
--- 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"/>