even more consolidation

[raggedstone] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 5d561564f179763d0ea929454eedd47c16b497f4..e9d4cfebd0618ccd6f48dfe2162bbca7eef2ef3c 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -7,7 +7,7 @@ CABLE ?= auto
 
 INTSTYLE := silent
 
 
 INTSTYLE := silent
 

-SOURCES = $(wildcard sources/*.v source/*.vhd)
+SOURCES := $(shell find . -name "*.vhd" -print) $(shell find . -name "*.v" -print)

 PART ?= xc3s1500-fg456-4
 TARGET ?= bit
 CLEANFILES ?=
 PART ?= xc3s1500-fg456-4
 TARGET ?= bit
 CLEANFILES ?=


@@ -78,8 +78,11 @@ flash: $(PROJECT)-xcf02s.mcs $(PROJECT)-xcf04s.mcs
        $(PRELOAD) impact -batch xcf.batch.tmp
        @rm xcf.batch.tmp
 
        $(PRELOAD) impact -batch xcf.batch.tmp
        @rm xcf.batch.tmp
 

+analyzer:
+       $(CHIPSCOPE)/bin/lin/analyzer.sh -project $(PWD)/$(PROJECT).cpj
+

 clean:
 clean:

-       @rm -rf *.bit *.bgn *.mcs *.prm *.bld *.drc *.mcs *.ncd *.ngc *.ngd *.edn *.ncf *.ngo \
+       @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* \
                *.vm6 *.jed *.gyd *.mfd *.pnx *.rpt *.err *.log \
                $(PROJECT)_map.* $(PROJECT)_pad.* \
                *.ngr *.pad *.par *.pcf *.prm *.syr *.twr *.twx *.xpi *.lso *.prm *.mcs _impact* \
                *.vm6 *.jed *.gyd *.mfd *.pnx *.rpt *.err *.log \
                $(PROJECT)_map.* $(PROJECT)_pad.* \


@@ -87,4 +90,4 @@ clean:
                build.log \
                $(PROJECT).unroutes *.xml $(CLEANFILES)
 
                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