From: michael <michael>
Date: Sun, 11 Feb 2007 21:11:53 +0000 (+0000)
Subject: move common files to common subdir
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/raggedstone/commitdiff_plain/b983c58b8128671dc7e2c8252af87fbb3aea4134

move common files to common subdir
let "make load" and "make flash" work for other projects, too
---

diff --git a/common/Makefile.common b/common/Makefile.common
index 51494f9..c275a06 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -54,12 +54,12 @@ burn: $(PROJECT).bit
 	xc3sprog $(PROJECT).bit
 
 load: $(PROJECT).bit
-	@sed -e "s|%CABLE%|$(CABLE)|g" xc3s1500.batch >xc3s1500.batch.tmp
+	@sed -e "s|%CABLE%|$(CABLE)|g" -e "s|%PROJECT%|$(PROJECT)|g" ../common/xc3s1500.batch >xc3s1500.batch.tmp
 	impact -batch xc3s1500.batch.tmp
 	@rm xc3s1500.batch.tmp
 
 flash: $(PROJECT)-xcf02s.mcs $(PROJECT)-xcf04s.mcs
-	@sed -e "s|%CABLE%|$(CABLE)|g" xcf.batch >xcf.batch.tmp
+	@sed -e "s|%CABLE%|$(CABLE)|g" -e "s|%PROJECT%|$(PROJECT)|g" ../common/xcf.batch >xcf.batch.tmp
 	impact -batch xcf.batch.tmp
 	@rm xcf.batch.tmp
 
diff --git a/common/xc3s1500.batch b/common/xc3s1500.batch
index 2671e04..90228dd 100644
--- a/common/xc3s1500.batch
+++ b/common/xc3s1500.batch
@@ -1,6 +1,6 @@
 setmode -bscan 
 setcable -p %CABLE%
 identify
-assignFile -p 3 -file raggedstone.bit
+assignFile -p 3 -file %PROJECT%.bit
 program -p 3
 quit
diff --git a/common/xcf.batch b/common/xcf.batch
index a4fad2b..6b9acdb 100644
--- a/common/xcf.batch
+++ b/common/xcf.batch
@@ -1,8 +1,8 @@
 setmode -bscan 
 setcable -p %CABLE%
 identify
-assignFile -p 1 -file raggedstone-xcf02s.mcs
-assignFile -p 2 -file raggedstone-xcf04s.mcs
+assignFile -p 1 -file %PROJECT%-xcf02s.mcs
+assignFile -p 2 -file %PROJECT%-xcf04s.mcs
 program -e -v -p 1
 program -e -v -p 2
 quit
diff --git a/heartbeat/Makefile b/heartbeat/Makefile
index 3771043..0bf5c98 100644
--- a/heartbeat/Makefile
+++ b/heartbeat/Makefile
@@ -1,3 +1,3 @@
 PROJECT := raggedstone
 
-include ../Makefile.common
+include ../common/Makefile.common