From 6178dfbbd612d15a46c7d2a439b2252d6d0a87ba Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 2 Mar 2016 12:34:51 +0100 Subject: Added Makefile support for "make STATIC=1" --- icemulti/Makefile | 4 ++++ icepack/Makefile | 4 ++++ icepll/Makefile | 4 ++++ iceprog/Makefile | 6 ++++++ icetime/Makefile | 4 ++++ 5 files changed, 22 insertions(+) diff --git a/icemulti/Makefile b/icemulti/Makefile index c901413..009889e 100644 --- a/icemulti/Makefile +++ b/icemulti/Makefile @@ -2,6 +2,10 @@ include ../config.mk LDLIBS = -lm -lstdc++ CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 +ifeq ($(STATIC),1) +LDFLAGS += -static +endif + all: icemulti$(EXE) icemulti$(EXE): icemulti.o diff --git a/icepack/Makefile b/icepack/Makefile index 78701db..cfe48be 100644 --- a/icepack/Makefile +++ b/icepack/Makefile @@ -3,6 +3,10 @@ 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 +ifeq ($(STATIC),1) +LDFLAGS += -static +endif + all: icepack$(EXE) iceunpack$(EXE) icepack$(EXE): icepack.o diff --git a/icepll/Makefile b/icepll/Makefile index b47de3e..e0badf6 100644 --- a/icepll/Makefile +++ b/icepll/Makefile @@ -2,6 +2,10 @@ include ../config.mk LDLIBS = -lm -lstdc++ CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include +ifeq ($(STATIC),1) +LDFLAGS += -static +endif + all: icepll$(EXE) icepll$(EXE): icepll.o diff --git a/iceprog/Makefile b/iceprog/Makefile index a124663..c618765 100644 --- a/iceprog/Makefile +++ b/iceprog/Makefile @@ -2,8 +2,14 @@ include ../config.mk LDLIBS = -L/usr/local/lib -lm CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include +ifeq ($(STATIC),1) +LDFLAGS += -static +LDLIBS += $(shell for pkg in libftdi libftdi1; do $(PKG_CONFIG) --silence-errors --static --libs $$pkg && exit; done; echo -lftdi; ) +CFLAGS += $(shell for pkg in libftdi libftdi1; do $(PKG_CONFIG) --silence-errors --static --cflags $$pkg && exit; done; ) +else LDLIBS += $(shell for pkg in libftdi libftdi1; do $(PKG_CONFIG) --silence-errors --libs $$pkg && exit; done; echo -lftdi; ) CFLAGS += $(shell for pkg in libftdi libftdi1; do $(PKG_CONFIG) --silence-errors --cflags $$pkg && exit; done; ) +endif all: iceprog$(EXE) diff --git a/icetime/Makefile b/icetime/Makefile index 6355f06..c56002b 100644 --- a/icetime/Makefile +++ b/icetime/Makefile @@ -2,6 +2,10 @@ include ../config.mk LDLIBS = -lm -lstdc++ CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include -DPREFIX='"$(PREFIX)"' +ifeq ($(STATIC),1) +LDFLAGS += -static +endif + all: icetime$(EXE) icetime$(EXE): icetime.o -- cgit v1.2.3