From 2c93b5ae28969362446e94dabe69ef518c171841 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Fri, 15 Mar 2013 12:10:28 +0100 Subject: [PATCH] build: Find libncurses by using pkg-config Call pkg-config --cflags and pkg-config --libs to find correct CFLAGS and LDFLAGS respectively. Signed-off-by: Daniel Borkmann --- Makefile | 2 ++ flowtop/Makefile | 2 +- ifpps/Makefile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 645cb2d3..dea11a20 100644 --- a/Makefile +++ b/Makefile @@ -217,6 +217,8 @@ $(foreach tool,$(TOOLS),$(eval $(call TOOL_templ,$(tool)))) netsniff-ng: ALL_CFLAGS += $(shell pkg-config --cflags libnl-3.0) $(shell pkg-config --cflags libnl-genl-3.0) -D__WITH_PROTOS -D__WITH_TCPDUMP_LIKE_FILTER trafgen: ALL_CFLAGS += -I.. $(shell pkg-config --cflags libnl-3.0) $(shell pkg-config --cflags libnl-genl-3.0) -D__WITH_PROTOS +ifpps: ALL_CFLAGS += $(shell pkg-config --cflags ncurses) +flowtop: ALL_CFLAGS += $(shell pkg-config --cflags ncurses) bpfc: ALL_CFLAGS += -I.. curvetun: ALL_CFLAGS += -I ${NACL_INC_DIR} curvetun: ALL_LDFLAGS += -L ${NACL_LIB_DIR} diff --git a/flowtop/Makefile b/flowtop/Makefile index f518f07d..29a58ce8 100644 --- a/flowtop/Makefile +++ b/flowtop/Makefile @@ -1,7 +1,7 @@ flowtop-libs = -lGeoIP \ -lurcu \ -lnetfilter_conntrack \ - -lncurses \ + $(shell pkg-config --libs ncurses) \ -lpthread \ -lz diff --git a/ifpps/Makefile b/ifpps/Makefile index 28c35441..a86e88c6 100644 --- a/ifpps/Makefile +++ b/ifpps/Makefile @@ -1,4 +1,4 @@ -ifpps-libs = -lncurses +ifpps-libs = $(shell pkg-config --libs ncurses) ifpps-objs = xmalloc.o \ xio.o \ -- 2.11.4.GIT