netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH libnetfilter_log] build: choose right automake variables
@ 2020-11-30 12:53 Jan Engelhardt
  2020-12-08 11:54 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Engelhardt @ 2020-11-30 12:53 UTC (permalink / raw)
  To: fw; +Cc: netfilter-devel

-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(-)

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
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH libnetfilter_log] build: choose right automake variables
  2020-11-30 12:53 [PATCH libnetfilter_log] build: choose right automake variables Jan Engelhardt
@ 2020-12-08 11:54 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2020-12-08 11:54 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: fw, netfilter-devel

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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-12-08 11:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-30 12:53 [PATCH libnetfilter_log] build: choose right automake variables Jan Engelhardt
2020-12-08 11:54 ` Pablo Neira Ayuso

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).