diff mbox series

[libnetfilter_log] build: choose right automake variables

Message ID 20201130125343.17469-1-jengelh@inai.de
State Accepted
Delegated to: Pablo Neira
Headers show
Series [libnetfilter_log] build: choose right automake variables | expand

Commit Message

Jan Engelhardt Nov. 30, 2020, 12:53 p.m. UTC
-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>
---
 utils/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Pablo Neira Ayuso Dec. 8, 2020, 11:54 a.m. UTC | #1
On Mon, Nov 30, 2020 at 01:53:43PM +0100, Jan Engelhardt wrote:
> -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.

Applied, thanks.
diff mbox series

Patch

diff --git utils/Makefile.am utils/Makefile.am
index a848b10..4afd91b 100644
--- utils/Makefile.am
+++ 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