summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stuge <peter@stuge.se>2013-03-14 17:15:17 +0100
committerDaniel Borkmann <dborkman@redhat.com>2013-03-15 11:17:02 +0100
commit41c5d99d584f8bffa77b94dcfcc0fa3c4c406e81 (patch)
tree8ca59f506d0598fecb9b365fa8fb0df91c3fbffa
parent1a9fbac03c684f29cff9ac44875bd9504a89f54e (diff)
netsniff-ng trafgen: Find libnl-3.0 and libnl-genl-3.0 using pkg-config
Call pkg-config --cflags and pkg-config --libs to find correct CFLAGS and LDFLAGS respectively. Signed-off-by: Peter Stuge <peter@stuge.se> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
-rw-r--r--Makefile4
-rw-r--r--netsniff-ng/Makefile4
-rw-r--r--trafgen/Makefile4
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index a211137..645cb2d 100644
--- a/Makefile
+++ b/Makefile
@@ -215,8 +215,8 @@ $(foreach tool,$(TOOLS),$(eval $(call TOOL_templ,$(tool))))
%:: ;
-netsniff-ng: ALL_CFLAGS += -I$(INCDIR)/libnl3/ -D__WITH_PROTOS -D__WITH_TCPDUMP_LIKE_FILTER
-trafgen: ALL_CFLAGS += -I.. -I$(INCDIR)/libnl3/ -D__WITH_PROTOS
+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
bpfc: ALL_CFLAGS += -I..
curvetun: ALL_CFLAGS += -I ${NACL_INC_DIR}
curvetun: ALL_LDFLAGS += -L ${NACL_LIB_DIR}
diff --git a/netsniff-ng/Makefile b/netsniff-ng/Makefile
index 269d403..46b885d 100644
--- a/netsniff-ng/Makefile
+++ b/netsniff-ng/Makefile
@@ -1,6 +1,6 @@
netsniff-ng-libs = -lGeoIP \
- -lnl-genl-3 \
- -lnl-3 \
+ $(shell pkg-config --libs libnl-3.0) \
+ $(shell pkg-config --libs libnl-genl-3.0) \
-lpcap \
-lpthread \
-lz
diff --git a/trafgen/Makefile b/trafgen/Makefile
index 289aa28..b34b98c 100644
--- a/trafgen/Makefile
+++ b/trafgen/Makefile
@@ -1,5 +1,5 @@
-trafgen-libs = -lnl-genl-3 \
- -lnl-3 \
+trafgen-libs = $(shell pkg-config --libs libnl-3.0) \
+ $(shell pkg-config --libs libnl-genl-3.0) \
-lm
trafgen-objs = xmalloc.o \