completely remove tmp uglyness

diff --git a/heartbeat/Makefile b/heartbeat/Makefile
index 8b3363628c2585c06d3be0958b732aeb8b10a0f5..7688155fbe434fe038cda604d75c16d85b992ff3 100644 (file)
--- a/heartbeat/Makefile
+++ b/heartbeat/Makefile
@@ -1,10 +1,12 @@
 PWD := $(shell pwd)
 
 PWD := $(shell pwd)
 

+PROJECT := raggedstone
+

 INTSTYLE := silent
 
 INTSTYLE := silent
 

-PROJECT := raggedstone
+SOURCES = $(wildcard sources/*.v source/*.vhd)

 
 

-all: xst ngdbuild map par trace prom final
+all: $(PROJECT).bit final

 
 log:
        time make all &>build.log
 
 log:
        time make all &>build.log


@@ -13,7 +15,7 @@ xst: $(PROJECT).ngc
 
 ngdbuild: $(PROJECT).ngd
 
 
 ngdbuild: $(PROJECT).ngd
 

-$(PROJECT).ngc:
+$(PROJECT).ngc: $(SOURCES)

        @# echo synclib > $(PROJECT).lso # hmm. things are different in ise 9.1
        echo work > $(PROJECT).lso
        xst -intstyle $(INTSTYLE) -ifn $(PROJECT).xst -ofn $(PROJECT).syr
        @# echo synclib > $(PROJECT).lso # hmm. things are different in ise 9.1
        echo work > $(PROJECT).lso
        xst -intstyle $(INTSTYLE) -ifn $(PROJECT).xst -ofn $(PROJECT).syr


@@ -22,18 +24,18 @@ $(PROJECT).ngc:
 $(PROJECT).ngd: $(PROJECT).ngc
        ngdbuild -intstyle $(INTSTYLE) -dd "$(PWD)/_ngo" -nt timestamp -uc $(PROJECT).ucf  -p xc3s1500-fg456-4 $(PROJECT).ngc $(PROJECT).ngd
 
 $(PROJECT).ngd: $(PROJECT).ngc
        ngdbuild -intstyle $(INTSTYLE) -dd "$(PWD)/_ngo" -nt timestamp -uc $(PROJECT).ucf  -p xc3s1500-fg456-4 $(PROJECT).ngc $(PROJECT).ngd
 

-map:
+$(PROJECT)_map.ngm $(PROJECT).pcf: $(PROJECT).ngd

        map -intstyle $(INTSTYLE) -p xc3s1500-fg456-4 -cm area -pr b -k 4 -c 100 -o $(PROJECT)_map.ncd $(PROJECT).ngd $(PROJECT).pcf
 
        map -intstyle $(INTSTYLE) -p xc3s1500-fg456-4 -cm area -pr b -k 4 -c 100 -o $(PROJECT)_map.ncd $(PROJECT).ngd $(PROJECT).pcf
 

-par:
+$(PROJECT).ncd: $(PROJECT)_map.ngm $(PROJECT).pcf

        @#par -w -intstyle $(INTSTYLE) -ol std -n 4 -t 1 $(PROJECT)_map.ncd $(PROJECT).dir $(PROJECT).pcf
        par -w -intstyle $(INTSTYLE) -ol std -t 1 $(PROJECT)_map.ncd $(PROJECT).ncd $(PROJECT).pcf
 
        @#par -w -intstyle $(INTSTYLE) -ol std -n 4 -t 1 $(PROJECT)_map.ncd $(PROJECT).dir $(PROJECT).pcf
        par -w -intstyle $(INTSTYLE) -ol std -t 1 $(PROJECT)_map.ncd $(PROJECT).ncd $(PROJECT).pcf
 

-trace:
+$(PROJECT).twx: $(PROJECT).ncd

        trce -intstyle $(INTSTYLE) -e 3 -l 3 -s 4 -xml $(PROJECT) $(PROJECT).ncd -o $(PROJECT).twr $(PROJECT).pcf
        @#cat $(PROJECT).twr
 
        trce -intstyle $(INTSTYLE) -e 3 -l 3 -s 4 -xml $(PROJECT) $(PROJECT).ncd -o $(PROJECT).twr $(PROJECT).pcf
        @#cat $(PROJECT).twr
 

-prom:
+$(PROJECT).bit: $(PROJECT).ncd

        bitgen -intstyle $(INTSTYLE) -f $(PROJECT).ut $(PROJECT).ncd
        @# cp $(PROJECT).bit ../jcarr_last.bit
        @#cat $(PROJECT).drc
        bitgen -intstyle $(INTSTYLE) -f $(PROJECT).ut $(PROJECT).ncd
        @# cp $(PROJECT).bit ../jcarr_last.bit
        @#cat $(PROJECT).drc