luke
/
icestorm
mirror of https://github.com/YosysHQ/icestorm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from qbit/master 

Add entry points for PYTHON and CXX
This commit is contained in:
Clifford Wolf 2015-08-19 09:06:37 +02:00
parent 235ff955e3 55a4636788
commit f3a2d5796a
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,3 +1,5 @@
PYTHON ?= python2
CXX ?= clang
all: all:
$(MAKE) -C icebox $(MAKE) -C icebox

5
icebox/Makefile
View File

@ -1,13 +1,14 @@
PYTHON ?= python2
DESTDIR = /usr/local DESTDIR = /usr/local
all: chipdb-1k.txt chipdb-8k.txt all: chipdb-1k.txt chipdb-8k.txt
chipdb-1k.txt: icebox.py iceboxdb.py icebox_chipdb.py chipdb-1k.txt: icebox.py iceboxdb.py icebox_chipdb.py
python2 icebox_chipdb.py > chipdb-1k.new $(PYTHON) icebox_chipdb.py > chipdb-1k.new
mv chipdb-1k.new chipdb-1k.txt mv chipdb-1k.new chipdb-1k.txt
chipdb-8k.txt: icebox.py iceboxdb.py icebox_chipdb.py chipdb-8k.txt: icebox.py iceboxdb.py icebox_chipdb.py
python2 icebox_chipdb.py -8 > chipdb-8k.new $(PYTHON) icebox_chipdb.py -8 > chipdb-8k.new
mv chipdb-8k.new chipdb-8k.txt mv chipdb-8k.new chipdb-8k.txt
clean: clean:

12
icefuzz/Makefile
View File

@ -27,8 +27,8 @@ else
cp cached_ramb_8k.txt bitdata_ramb_8k.txt cp cached_ramb_8k.txt bitdata_ramb_8k.txt
cp cached_ramt_8k.txt bitdata_ramt_8k.txt cp cached_ramt_8k.txt bitdata_ramt_8k.txt
endif endif
python2 database.py $(PYTHON) database.py
python2 export.py $(PYTHON) export.py
diff -U0 cached_io.txt bitdata_io.txt || cp -v bitdata_io.txt cached_io.txt diff -U0 cached_io.txt bitdata_io.txt || cp -v bitdata_io.txt cached_io.txt
diff -U0 cached_logic.txt bitdata_logic.txt || cp -v bitdata_logic.txt cached_logic.txt diff -U0 cached_logic.txt bitdata_logic.txt || cp -v bitdata_logic.txt cached_logic.txt
diff -U0 cached_ramb.txt bitdata_ramb.txt || cp -v bitdata_ramb.txt cached_ramb.txt diff -U0 cached_ramb.txt bitdata_ramb.txt || cp -v bitdata_ramb.txt cached_ramb.txt
@ -63,13 +63,13 @@ datafiles: $(addprefix data_,$(addsuffix .txt,$(TESTS)))
define data_template define data_template
data_$(1).txt: make_$(1).py ../icepack/icepack data_$(1).txt: make_$(1).py ../icepack/icepack
ifeq ($(EIGTHK),_8k) ifeq ($(EIGTHK),_8k)
ICE8KPINS=1 python2 make_$(1).py ICE8KPINS=1 $(PYTHON) make_$(1).py
ICEDEV=hx8k-ct256 $$(MAKE) -C work_$(1) ICEDEV=hx8k-ct256 $$(MAKE) -C work_$(1)
python2 extract.py -8 work_$(1)/*.glb > $$@ $$(PYTHON) extract.py -8 work_$(1)/*.glb > $$@
else else
python2 make_$(1).py $$(PYTHON) make_$(1).py
$$(MAKE) -C work_$(1) $$(MAKE) -C work_$(1)
python2 extract.py work_$(1)/*.glb > $$@ $$(PYTHON) extract.py work_$(1)/*.glb > $$@
endif endif
endef endef

1
icemulti/Makefile
View File

@ -1,4 +1,5 @@
# CXX = clang # CXX = clang
CXX ?= clang
LDLIBS = -lm -lstdc++ LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11
CC = $(CXX) CC = $(CXX)

3
icepack/Makefile
View File

@ -1,6 +1,7 @@
# CXX = clang # CXX = clang
CXX ?= clang
LDLIBS = -lm -lstdc++ LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
CC = $(CXX) CC = $(CXX)
DESTDIR = /usr/local DESTDIR = /usr/local

4
iceprog/Makefile
View File

@ -1,6 +1,6 @@
# CC = clang # CC = clang
LDLIBS = -lftdi -lm LDLIBS = -L/usr/local/lib -lftdi -lm
CFLAGS = -MD -O0 -ggdb -Wall -std=c99 CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
DESTDIR = /usr/local DESTDIR = /usr/local
all: iceprog all: iceprog