From f5e6af20ca64efec2eea066b18d466f73d20bcab Mon Sep 17 00:00:00 2001
From: Michael Gernoth <michael@gernoth.net>
Date: Thu, 27 Mar 2008 23:00:24 +0100
Subject: [PATCH] only regenerate cores when needed, and not on every build

---
 common/Makefile.common               | 2 +-
 dhwk/Makefile                        | 8 ++++----
 dhwk/{icon.xco => icon_core.xco}     | 0
 dhwk/{ila.xco => ila_core.xco}       | 0
 dhwk/{vio.xco => vio_core.xco}       | 0
 ethernet/Makefile                    | 6 +++---
 ethernet/{icon.xco => icon_core.xco} | 0
 ethernet/{ila.xco => ila_core.xco}   | 0
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename dhwk/{icon.xco => icon_core.xco} (100%)
 rename dhwk/{ila.xco => ila_core.xco} (100%)
 rename dhwk/{vio.xco => vio_core.xco} (100%)
 rename ethernet/{icon.xco => icon_core.xco} (100%)
 rename ethernet/{ila.xco => ila_core.xco} (100%)

diff --git a/common/Makefile.common b/common/Makefile.common
index bbf4218..1cb3593 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -7,7 +7,7 @@ CABLE ?= auto
 
 INTSTYLE := silent
 
-SOURCES := $(shell find . -name "*.vhd" -print) $(shell find . -name "*.v" -print)
+SOURCES := $(shell find . -wholename './tmp' -prune -o -name "*.vhd" -print) $(shell find . -wholename './tmp' -prune -o -name "*.v" -print)
 PART ?= xc3s1500-fg456-4
 TARGET ?= bit
 CLEANFILES ?=
diff --git a/dhwk/Makefile b/dhwk/Makefile
index fed9553..c4d6743 100644
--- a/dhwk/Makefile
+++ b/dhwk/Makefile
@@ -1,19 +1,19 @@
 PROJECT := dhwk
-CLEANFILES := dhwk_fifo* fifo_generator_* param.opt icon.vhd icon.vho icon_flist.txt icon_readme.txt icon_xmdf.tcl ila.vhd ila.vho ila_flist.txt ila_readme.txt ila_xmdf.tcl vio.vhd vio.vho vio_flist.txt vio_readme.txt vio_xmdf.tcl
+CLEANFILES := dhwk_fifo* fifo_generator_* param.opt icon.* icon_flist.txt icon_readme.txt icon_xmdf.tcl ila.* ila_flist.txt ila_readme.txt ila_xmdf.tcl vio.* vio_flist.txt vio_readme.txt vio_xmdf.tcl
 
 dhwk_all: ip all
 
 ip: icon.ngc ila.ngc vio.ngc dhwk_fifo.ngc
 
-icon.ngc: icon.xco
+icon.ngc: icon_core.xco
 	coregen -b $<
 	-rmdir -p tmp/_cg
 
-ila.ngc: ila.xco
+ila.ngc: ila_core.xco
 	coregen -b $<
 	-rmdir -p tmp/_cg
 
-vio.ngc: vio.xco
+vio.ngc: vio_core.xco
 	coregen -b $<
 	-rmdir -p tmp/_cg
 
diff --git a/dhwk/icon.xco b/dhwk/icon_core.xco
similarity index 100%
rename from dhwk/icon.xco
rename to dhwk/icon_core.xco
diff --git a/dhwk/ila.xco b/dhwk/ila_core.xco
similarity index 100%
rename from dhwk/ila.xco
rename to dhwk/ila_core.xco
diff --git a/dhwk/vio.xco b/dhwk/vio_core.xco
similarity index 100%
rename from dhwk/vio.xco
rename to dhwk/vio_core.xco
diff --git a/ethernet/Makefile b/ethernet/Makefile
index e8a7031..f4480c9 100644
--- a/ethernet/Makefile
+++ b/ethernet/Makefile
@@ -1,15 +1,15 @@
 PROJECT := ethernet
-CLEANFILES := param.opt icon.vhd icon.vho icon_flist.txt icon_readme.txt icon_xmdf.tcl ila.vhd ila.vho ila_flist.txt ila_readme.txt ila_xmdf.tcl
+CLEANFILES := param.opt icon.* icon_flist.txt icon_readme.txt icon_xmdf.tcl ila.* ila_flist.txt ila_readme.txt ila_xmdf.tcl
 
 ethernet_all: ip all
 
 ip: icon.ngc ila.ngc
 
-icon.ngc: icon.xco
+icon.ngc: icon_core.xco
 	coregen -b $<
 	-rmdir -p tmp/_cg
 
-ila.ngc: ila.xco
+ila.ngc: ila_core.xco
 	coregen -b $<
 	-rmdir -p tmp/_cg
 
diff --git a/ethernet/icon.xco b/ethernet/icon_core.xco
similarity index 100%
rename from ethernet/icon.xco
rename to ethernet/icon_core.xco
diff --git a/ethernet/ila.xco b/ethernet/ila_core.xco
similarity index 100%
rename from ethernet/ila.xco
rename to ethernet/ila_core.xco
-- 
2.39.5