| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | From 0f1653c82a06567ccb151e17f1fe3ff3c3b465f3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Toni Uhlig <matzeton@googlemail.com> |
| 3 | Date: Mon, 18 May 2020 20:27:32 +0200 |
| 4 | Subject: [PATCH] removed flowtop pkg-config usage for ncurses |
| 5 | |
| 6 | Signed-off-by: Toni Uhlig <matzeton@googlemail.com> |
| 7 | --- |
| 8 | flowtop/Makefile | 6 ++---- |
| 9 | 1 file changed, 2 insertions(+), 4 deletions(-) |
| 10 | |
| 11 | --- a/flowtop/Makefile |
| 12 | +++ b/flowtop/Makefile |
| 13 | @@ -1,7 +1,6 @@ |
| 14 | flowtop-libs = -lurcu \ |
| 15 | $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnetfilter_conntrack 2> /dev/null ) \ |
| 16 | - $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs ncurses 2> /dev/null \ |
| 17 | - || echo '-lncurses') \ |
| 18 | + -lncurses \ |
| 19 | $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs tinfo 2> /dev/null ) \ |
| 20 | -lpthread |
| 21 | |
| 22 | @@ -30,8 +29,7 @@ flowtop-objs += geoip.o \ |
| 23 | ioops.o |
| 24 | endif |
| 25 | |
| 26 | -flowtop-eflags = $(shell $(PKG_CONFIG) --cflags ncurses) \ |
| 27 | - $(shell $(PKG_CONFIG) --cflags libnetfilter_conntrack) |
| 28 | +flowtop-eflags = $(shell $(PKG_CONFIG) --cflags libnetfilter_conntrack) |
| 29 | |
| 30 | flowtop-confs = tcp.conf \ |
| 31 | udp.conf \ |