From 43e77416362f57e4dbc3ac7cb8049ab3a427130f Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 29 Feb 2016 10:37:42 +0100 Subject: Use pkg-config for libftdi --- config.mk | 2 ++ iceprog/Makefile | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config.mk b/config.mk index 36c03c2..ae64067 100644 --- a/config.mk +++ b/config.mk @@ -1,9 +1,11 @@ CXX = clang CC = $(CXX) +PKG_CONFIG = pkg-config DESTDIR ?= PREFIX ?= /usr/local ifeq ($(MXE),1) EXE = .exe CXX = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc +PKG_CONFIG = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-pkg-config endif diff --git a/iceprog/Makefile b/iceprog/Makefile index b9f00d9..a124663 100644 --- a/iceprog/Makefile +++ b/iceprog/Makefile @@ -1,10 +1,9 @@ include ../config.mk -LDLIBS = -L/usr/local/lib -lftdi -lm +LDLIBS = -L/usr/local/lib -lm CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include -ifeq ($(MXE),1) -LDLIBS += -lusb -endif +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; ) all: iceprog$(EXE) -- cgit v1.2.3