Merge branch 'makefiles' of https://github.com/lineprinter/icestorm into lineprinter-makefiles

This commit is contained in:
Clifford Wolf 2017-02-13 14:39:44 +01:00
commit ce4e1bcfd8
9 changed files with 21 additions and 56 deletions

View File

@ -1,40 +1,11 @@
include config.mk include config.mk
all: SUBDIRS = icebox icepack iceprog icemulti icepll icetime icebram
$(MAKE) -C icebox
$(MAKE) -C icepack
$(MAKE) -C iceprog
$(MAKE) -C icemulti
$(MAKE) -C icepll
$(MAKE) -C icetime
$(MAKE) -C icebram
clean: all clean install uninstall:
$(MAKE) -C icebox clean for dir in $(SUBDIRS); do \
$(MAKE) -C icepack clean $(MAKE) -C $$dir $@ || exit; \
$(MAKE) -C iceprog clean done
$(MAKE) -C icemulti clean
$(MAKE) -C icepll clean
$(MAKE) -C icetime clean
$(MAKE) -C icebram clean
install:
$(MAKE) -C icebox install
$(MAKE) -C icepack install
$(MAKE) -C iceprog install
$(MAKE) -C icemulti install
$(MAKE) -C icepll install
$(MAKE) -C icetime install
$(MAKE) -C icebram install
uninstall:
$(MAKE) -C icebox uninstall
$(MAKE) -C icepack uninstall
$(MAKE) -C iceprog uninstall
$(MAKE) -C icemulti uninstall
$(MAKE) -C icepll uninstall
$(MAKE) -C icetime uninstall
$(MAKE) -C icebram uninstall
mxebin: clean mxebin: clean
$(MAKE) MXE=1 $(MAKE) MXE=1

View File

@ -1,5 +1,8 @@
CXX ?= clang CXX ?= clang++
CC ?= $(CXX) CC ?= clang
LDLIBS = -lm -lstdc++
CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
PKG_CONFIG ?= pkg-config PKG_CONFIG ?= pkg-config
DESTDIR ?= DESTDIR ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local

View File

@ -1,6 +1,4 @@
include ../config.mk include ../config.mk
LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
ifeq ($(STATIC),1) ifeq ($(STATIC),1)
LDFLAGS += -static LDFLAGS += -static
@ -9,7 +7,7 @@ endif
all: icebram$(EXE) all: icebram$(EXE)
icebram$(EXE): icebram.o icebram$(EXE): icebram.o
$(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
test: icebram test: icebram
bash rundemo.sh bash rundemo.sh

View File

@ -1,13 +1,14 @@
include ../config.mk
all: icecompr iceuncompr all: icecompr iceuncompr
test: example_1k.ok example_8k.ok test: example_1k.ok example_8k.ok
icecompr: icecompr.cc icecompr: icecompr.o
clang++ -o icecompr -Wall -Wextra -std=c++11 icecompr.cc $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
iceuncompr: iceuncompr.c iceuncompr: iceuncompr.o
clang -o iceuncompr -Wall -Wextra iceuncompr.c $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS)
%.compr: %.bin icecompr %.compr: %.bin icecompr
./icecompr -v $< $@ ./icecompr -v $< $@

View File

@ -1,6 +1,4 @@
include ../config.mk include ../config.mk
LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11
ifeq ($(STATIC),1) ifeq ($(STATIC),1)
LDFLAGS += -static LDFLAGS += -static
@ -9,7 +7,7 @@ endif
all: icemulti$(EXE) all: icemulti$(EXE)
icemulti$(EXE): icemulti.o icemulti$(EXE): icemulti.o
$(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
install: all install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin mkdir -p $(DESTDIR)$(PREFIX)/bin

View File

@ -1,6 +1,4 @@
include ../config.mk include ../config.mk
LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc
ifeq ($(STATIC),1) ifeq ($(STATIC),1)
@ -10,7 +8,7 @@ endif
all: icepack$(EXE) iceunpack$(EXE) all: icepack$(EXE) iceunpack$(EXE)
icepack$(EXE): icepack.o icepack$(EXE): icepack.o
$(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
iceunpack: icepack iceunpack: icepack
ln -sf icepack iceunpack ln -sf icepack iceunpack

View File

@ -1,6 +1,4 @@
include ../config.mk include ../config.mk
LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
ifeq ($(STATIC),1) ifeq ($(STATIC),1)
LDFLAGS += -static LDFLAGS += -static
@ -9,7 +7,7 @@ endif
all: icepll$(EXE) all: icepll$(EXE)
icepll$(EXE): icepll.o icepll$(EXE): icepll.o
$(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
install: all install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin mkdir -p $(DESTDIR)$(PREFIX)/bin

View File

@ -2,11 +2,9 @@ include ../config.mk
ifneq ($(shell uname -s),Darwin) ifneq ($(shell uname -s),Darwin)
LDLIBS = -L/usr/local/lib -lm LDLIBS = -L/usr/local/lib -lm
CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
else else
LIBFTDI_NAME = $(shell $(PKG_CONFIG) --exists libftdi1 && echo ftdi1 || echo ftdi) LIBFTDI_NAME = $(shell $(PKG_CONFIG) --exists libftdi1 && echo ftdi1 || echo ftdi)
LDLIBS = -L/usr/local/lib -l$(LIBFTDI_NAME) -lm LDLIBS = -L/usr/local/lib -l$(LIBFTDI_NAME) -lm
CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
endif endif
ifeq ($(STATIC),1) ifeq ($(STATIC),1)

View File

@ -1,6 +1,6 @@
include ../config.mk include ../config.mk
LDLIBS = -lm -lstdc++ LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include -DPREFIX='"$(PREFIX)"' -DCHIPDB_SUBDIR='"$(CHIPDB_SUBDIR)"' override CXXFLAGS += -DPREFIX='"$(PREFIX)"' -DCHIPDB_SUBDIR='"$(CHIPDB_SUBDIR)"'
ifeq ($(STATIC),1) ifeq ($(STATIC),1)
LDFLAGS += -static LDFLAGS += -static
@ -9,7 +9,7 @@ endif
all: icetime$(EXE) all: icetime$(EXE)
icetime$(EXE): icetime.o icetime$(EXE): icetime.o
$(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
icetime.o: icetime.cc timings.inc icetime.o: icetime.cc timings.inc