diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | icebox/Makefile | 4 | ||||
| -rw-r--r-- | icefuzz/Makefile | 12 | ||||
| -rw-r--r-- | icemulti/Makefile | 1 | ||||
| -rw-r--r-- | icepack/Makefile | 3 | ||||
| -rw-r--r-- | iceprog/Makefile | 4 |
6 files changed, 15 insertions, 11 deletions
@@ -1,3 +1,5 @@ +PYTHON ?= python2 +CXX ?= clang all: $(MAKE) -C icebox diff --git a/icebox/Makefile b/icebox/Makefile index cc78073..f611cce 100644 --- a/icebox/Makefile +++ b/icebox/Makefile @@ -3,11 +3,11 @@ DESTDIR = /usr/local all: chipdb-1k.txt chipdb-8k.txt 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 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 clean: diff --git a/icefuzz/Makefile b/icefuzz/Makefile index 8c93413..59fb433 100644 --- a/icefuzz/Makefile +++ b/icefuzz/Makefile @@ -27,8 +27,8 @@ else cp cached_ramb_8k.txt bitdata_ramb_8k.txt cp cached_ramt_8k.txt bitdata_ramt_8k.txt endif - python2 database.py - python2 export.py + $(PYTHON) database.py + $(PYTHON) export.py 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_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 data_$(1).txt: make_$(1).py ../icepack/icepack ifeq ($(EIGTHK),_8k) - ICE8KPINS=1 python2 make_$(1).py + ICE8KPINS=1 $(PYTHON) make_$(1).py ICEDEV=hx8k-ct256 $$(MAKE) -C work_$(1) - python2 extract.py -8 work_$(1)/*.glb > $$@ + $$(PYTHON) extract.py -8 work_$(1)/*.glb > $$@ else - python2 make_$(1).py + $$(PYTHON) make_$(1).py $$(MAKE) -C work_$(1) - python2 extract.py work_$(1)/*.glb > $$@ + $$(PYTHON) extract.py work_$(1)/*.glb > $$@ endif endef diff --git a/icemulti/Makefile b/icemulti/Makefile index 0b4e0aa..f195e61 100644 --- a/icemulti/Makefile +++ b/icemulti/Makefile @@ -1,4 +1,5 @@ # CXX = clang +CXX ?= clang LDLIBS = -lm -lstdc++ CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 CC = $(CXX) diff --git a/icepack/Makefile b/icepack/Makefile index 6f908a4..559a66d 100644 --- a/icepack/Makefile +++ b/icepack/Makefile @@ -1,6 +1,7 @@ # CXX = clang +CXX ?= clang 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) DESTDIR = /usr/local diff --git a/iceprog/Makefile b/iceprog/Makefile index 86c69f4..a32f2b7 100644 --- a/iceprog/Makefile +++ b/iceprog/Makefile @@ -1,6 +1,6 @@ # CC = clang -LDLIBS = -lftdi -lm -CFLAGS = -MD -O0 -ggdb -Wall -std=c99 +LDLIBS = -L/usr/local/lib -lftdi -lm +CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include DESTDIR = /usr/local all: iceprog |