diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-08-31 21:54:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-31 21:54:45 +0200 |
| commit | 04f1eb78ed8fd50516aee50102675041a8fd40cd (patch) | |
| tree | 38388076bb73c740c402f44fe78f2b7b63d9c083 | |
| parent | 95949315364f8d9b0c693386aefadf44b28e2cf6 (diff) | |
| parent | 37227e2b18c7dffa6ce881632b1cdf40f3b8c3d8 (diff) | |
| download | icestorm-04f1eb78ed8fd50516aee50102675041a8fd40cd.tar.gz icestorm-04f1eb78ed8fd50516aee50102675041a8fd40cd.tar.bz2 icestorm-04f1eb78ed8fd50516aee50102675041a8fd40cd.zip | |
Merge pull request #235 from whitequark/master
Make iceprog optional
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | config.mk | 1 |
2 files changed, 6 insertions, 2 deletions
@@ -1,7 +1,10 @@ -SUBDIRS = icebox icepack iceprog icemulti icepll icetime icebram - include config.mk +SUBDIRS := icebox icepack icemulti icepll icebram icetime +ifeq ($(ICEPROG),1) +SUBDIRS += iceprog +endif + all: $(addsuffix .all,$(SUBDIRS)) $(addsuffix .all,$(SUBDIRS)): $(MAKE) -C $(basename $@) all @@ -1,5 +1,6 @@ PREFIX ?= /usr/local DEBUG ?= 0 +ICEPROG ?= 1 CXX ?= clang++ CC ?= clang |