X-Git-Url: http://sraa.de/git/?a=blobdiff_plain;f=aesa%2FMakefile;h=39a2f15cab461c8ca11fcee3a507e5156836c6e9;hb=84b2539b604e9b7781aa0bd56a09b2736b661ce2;hp=32529352c66faa1f05e110a531a4d93716b58100;hpb=38ee53ed1ec62a145b7c90e91118ea0d33edc6bc;p=jump.git

diff --git a/aesa/Makefile b/aesa/Makefile
index 3252935..39a2f15 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
 
@@ -18,7 +18,7 @@ SYSTEMC_LIB = $(HOME)/systemc/lib-linux64/libsystemc.a
 JAVA	?= java
 JAVAC	?= javac
 DOTTY	?= dotty
-ECHO	?= echo
+ECHO	?= /bin/echo -e
 SED	?= sed
 CP	?= cp
 RM	?= rm
@@ -28,7 +28,7 @@ RM	?= rm
 
 SRCPATH   = generated
 CLASSPATH = $(DOLPATH)/dol.jar:$(DOLPATH)/jdom.jar:$(DOLPATH)/xercesImpl.jar
-.PHONY : help all run codegen dotty clean 
+.PHONY : help all run codegen dotty clean
 
 help:
 	@$(ECHO) "Target List:\n" \
@@ -38,7 +38,7 @@ help:
 		"\tcodegen -- generate code, but do not compile\n" \
 		"\tdotty   -- show flattened process network using DOTTY\n" \
 		"\tclean   -- clean generated files\n"
-		 
+
 all: $(PROGRAM)
 
 codegen: $(SRCPATH)/src/Makefile.new
@@ -51,7 +51,7 @@ clean:
 	@$(ECHO) "\t[CLEAN]"
 	@$(RM) -rf $(PROGRAM) $(SRCPATH)/ $(PROGRAM)_flattened.xml \
 		$(PROGRAM)_Generator.java $(PROGRAM)_Generator.class \
-		$(PROGRAM).dot profile.txt
+		$(PROGRAM).dot profile.txt output.txt
 
 $(PROGRAM): $(SRCPATH)/src/sc_application
 	@$(ECHO) "\t[COPY]\t$@"
@@ -72,7 +72,7 @@ $(SRCPATH)/src/Makefile: $(PROGRAM)_flattened.xml
 	@$(ECHO) "\t[GEN]\t$@"
 	@$(JAVA) -cp $(CLASSPATH) dol.main.Main -P $(PROGRAM)_flattened.xml \
 		$(CODEGEN) $(SRCPATH) -c >/dev/null
-	
+
 $(PROGRAM)_flattened.xml: $(PROGRAM).xml
 	@$(ECHO) "\t[FLAT]\t$^"
 	@$(JAVA) -cp $(CLASSPATH) dol.helper.flattener.XMLFlattener \