white space; fixme

[raggedstone] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index fa67e3b2350166768d48f282915d14d4d3adda0f..7b042b5f4ee1ad50eb35a8e00d73722e25369dfa 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -7,7 +7,7 @@ CABLE ?= auto
 
 INTSTYLE := silent
 
-SOURCES = $(wildcard sources/*.v source/*.vhd)
+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 ?=
@@ -29,6 +29,7 @@ $(PROJECT).ngc: $(SOURCES) $(PROJECT).prj $(PROJECT).ucf $(PROJECT).xst
        @# 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
+       @touch $(PROJECT).ngc
        @#cat $(PROJECT).syr
 
 $(PROJECT).ngd: $(PROJECT).ngc
@@ -73,11 +74,17 @@ load: $(PROJECT).bit
        $(PRELOAD) impact -batch xc3s1500.batch.tmp
        @rm xc3s1500.batch.tmp
 
-flash: $(PROJECT)-xcf02s.mcs $(PROJECT)-xcf04s.mcs
+flash:
+       @echo "NO"
+
+i-really-want-to-flash: $(PROJECT)-xcf02s.mcs $(PROJECT)-xcf04s.mcs
        @sed -e "s|%CABLE%|$(CABLE)|g" -e "s|%PROJECT%|$(PROJECT)|g" ../common/xcf.batch >xcf.batch.tmp
        $(PRELOAD) impact -batch xcf.batch.tmp
        @rm xcf.batch.tmp
 
+analyzer:
+       $(CHIPSCOPE)/bin/lin/analyzer.sh -project $(PWD)/$(PROJECT).cpj
+
 clean:
        @rm -rf *.bit *.bgn *.mcs *.prm *.bld *.drc *.mcs *.ncd *.ngc *.ngd *.edn *.ncf *.ngo *.cdc \
                *.ngr *.pad *.par *.pcf *.prm *.syr *.twr *.twx *.xpi *.lso *.prm *.mcs _impact* \
@@ -87,4 +94,4 @@ clean:
                build.log \
                $(PROJECT).unroutes *.xml $(CLEANFILES)
 
-.PHONY: all final burn load flash clean xst ngdbuild log
+.PHONY: all final burn load flash clean xst ngdbuild log analyzer i-really-want-to-flash