diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-07-23 15:55:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-23 15:55:22 +0200 |
| commit | 5d14357f91fb05feef7db0382f0dbec8b7c49099 (patch) | |
| tree | 3286dcab1f11496cfe6a43c2e3a916cb9a9c1048 | |
| parent | 75fd59c5b4d0d11d18af4779d43e155f498268e7 (diff) | |
| parent | 3578b35900dddf69822d2fe19052e059989b0d8f (diff) | |
| download | icestorm-5d14357f91fb05feef7db0382f0dbec8b7c49099.tar.gz icestorm-5d14357f91fb05feef7db0382f0dbec8b7c49099.tar.bz2 icestorm-5d14357f91fb05feef7db0382f0dbec8b7c49099.zip | |
Merge pull request #48 from Jesus89/libftdi
Give priority to libftdi1 over libftdi
| -rw-r--r-- | iceprog/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/iceprog/Makefile b/iceprog/Makefile index c618765..5b9f790 100644 --- a/iceprog/Makefile +++ b/iceprog/Makefile @@ -4,11 +4,11 @@ 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; ) +LDLIBS += $(shell for pkg in libftdi1 libftdi; do $(PKG_CONFIG) --silence-errors --static --libs $$pkg && exit; done; echo -lftdi; ) +CFLAGS += $(shell for pkg in libftdi1 libftdi; 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; ) +LDLIBS += $(shell for pkg in libftdi1 libftdi; do $(PKG_CONFIG) --silence-errors --libs $$pkg && exit; done; echo -lftdi; ) +CFLAGS += $(shell for pkg in libftdi1 libftdi; do $(PKG_CONFIG) --silence-errors --cflags $$pkg && exit; done; ) endif all: iceprog$(EXE) |