summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@inai.de>2020-11-30 13:53:43 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2020-12-08 12:55:34 +0100
commiteb9fd4783538a954d8c77d54b6a7b306bacb8625 (patch)
treedc6623d30888737409db5d9ce5c7fd35d28a5b4a
parent31bd7634ee17dcb4dde030bf5161473afbd579e3 (diff)
build: choose right automake variables
-D is a preprocessor flag, needs to go into _CPPFLAGS; -l is a library selection, needs to go into _LDADD/_LIBADD. NETFILTER_CONNTRACK_CFLAGS was missing, too. Signed-off-by: Jan Engelhardt <jengelh@inai.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--utils/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am
index a848b10..4afd91b 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -7,11 +7,11 @@ nfulnl_test_LDADD = ../src/libnetfilter_log.la
nfulnl_test_LDFLAGS = -dynamic
nf_log_SOURCES = nf-log.c
-nf_log_LDADD = ../src/libnetfilter_log.la
-nf_log_LDFLAGS = -dynamic -lmnl
+nf_log_LDADD = ../src/libnetfilter_log.la -lmnl
+nf_log_LDFLAGS = -dynamic
if BUILD_NFCT
nf_log_LDFLAGS += $(LIBNETFILTER_CONNTRACK_LIBS)
-nf_log_CFLAGS = -DBUILD_NFCT
+nf_log_CPPFLAGS = ${AM_CPPFLAGS} ${LIBNETFILTER_CONNTRACK_CFLAGS} -DBUILD_NFCT
endif
if BUILD_IPULOG