From 97fb1ee97043b696bae09458fa125550b98bc201 Mon Sep 17 00:00:00 2001
From: Sebastian <basti@sraa.de>
Date: Tue, 20 Aug 2013 18:10:47 +0200
Subject: [PATCH] introduce $SRCPATH, build systemC by default

Generate code from DOL to $SRCPATH, instead of systemc/.
While at it, make it generate systemC code by default,
instead of HdS (Hardware dependent Software) code (-C instead of -H).
---
 dol_example1/Makefile | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/dol_example1/Makefile b/dol_example1/Makefile
index 81b3c74..0d34d51 100644
--- a/dol_example1/Makefile
+++ b/dol_example1/Makefile
@@ -22,6 +22,7 @@ RM	?= rm
 # don't change anything below
 # ===========================================================================
 
+SRCPATH   = systemc
 CLASSPATH = $(DOLPATH)/dol.jar:$(DOLPATH)/jdom.jar:$(DOLPATH)/xercesImpl.jar
 .PHONY : all help run systemc dotty clean 
 
@@ -36,7 +37,7 @@ help:
 		"\tdotty   -- show flattened process network using DOTTY\n" \
 		"\tclean   -- clean generated files\n"
 		 
-systemc: systemc/src/Makefile.new
+systemc: $(SRCPATH)/src/Makefile.new
 
 run: $(PROGRAM)
 	@$(ECHO) "\t[RUN]\t$^"
@@ -44,29 +45,29 @@ run: $(PROGRAM)
 
 clean:
 	@$(ECHO) "\t[CLEAN]"
-	@$(RM) -rf $(PROGRAM) systemc/ $(PROGRAM)_flattened.xml \
+	@$(RM) -rf $(PROGRAM) $(SRCPATH)/ $(PROGRAM)_flattened.xml \
 		$(PROGRAM)_Generator.java $(PROGRAM)_Generator.class \
 		$(PROGRAM).dot profile.txt
 
-$(PROGRAM): systemc/src/sc_application
+$(PROGRAM): $(SRCPATH)/src/sc_application
 	@$(ECHO) "\t[COPY]\t$@"
 	@$(CP) $^ $@
 
-systemc/src/sc_application: systemc/src/Makefile.new
+$(SRCPATH)/src/sc_application: $(SRCPATH)/src/Makefile.new
 	@$(ECHO) "\t[MAKE]\t$<"
-	@$(MAKE) -f Makefile.new -C systemc/src
+	@$(MAKE) -f Makefile.new -C $(SRCPATH)/src
 
-systemc/src/Makefile.new: systemc/src/Makefile
+$(SRCPATH)/src/Makefile.new: $(SRCPATH)/src/Makefile
 	@$(ECHO) "\t[GEN]\t$@"
 	@$(SED) -e 's@^SYSTEMC_INC.*@SYSTEMC_INC = -I$(SYSTEMC_INC)@' \
 		-e 's@^SYSTEMC_LIB.*@SYSTEMC_LIB = $(SYSTEMC_LIB)@' \
 		-e 's@^MY_LIB_INC.*@& -lpthread@' \
-		systemc/src/Makefile > systemc/src/Makefile.new
+		$(SRCPATH)/src/Makefile > $(SRCPATH)/src/Makefile.new
 
-systemc/src/Makefile: $(PROGRAM)_flattened.xml
+$(SRCPATH)/src/Makefile: $(PROGRAM)_flattened.xml
 	@$(ECHO) "\t[GEN]\t$@"
 	@$(JAVA) -cp $(CLASSPATH) dol.main.Main -P $(PROGRAM)_flattened.xml \
-		-H systemc -c >/dev/null
+		-C $(SRCPATH) -c >/dev/null
 	
 $(PROGRAM)_flattened.xml: $(PROGRAM).xml
 	@$(ECHO) "\t[FLAT]\t$^"
-- 
2.30.2