* [PATCH libnetfilter_conntrack 1/2] build: use the right automake variables
@ 2020-11-30 13:21 Jan Engelhardt
2020-11-30 13:21 ` [PATCH libnetfilter_conntrack 2/2] Update .gitignore Jan Engelhardt
2020-12-08 12:08 ` [PATCH libnetfilter_conntrack 1/2] build: use the right automake variables Pablo Neira Ayuso
0 siblings, 2 replies; 3+ messages in thread
From: Jan Engelhardt @ 2020-11-30 13:21 UTC (permalink / raw)
To: fw; +Cc: netfilter-devel
-l is a library selection and needs to go into _LDADD/_LIBADD.
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
examples/Makefile.am | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git examples/Makefile.am examples/Makefile.am
index a366390..c3373db 100644
--- examples/Makefile.am
+++ examples/Makefile.am
@@ -12,41 +12,41 @@ check_PROGRAMS = nfct-mnl-create \
nfexp-mnl-event
nfct_mnl_create_SOURCES = nfct-mnl-create.c
-nfct_mnl_create_LDADD = ../src/libnetfilter_conntrack.la
-nfct_mnl_create_LDFLAGS = -dynamic -ldl -lmnl
+nfct_mnl_create_LDADD = ../src/libnetfilter_conntrack.la -ldl ${LIBMNL_LIBS}
+nfct_mnl_create_LDFLAGS = -dynamic
nfct_mnl_del_SOURCES = nfct-mnl-del.c
-nfct_mnl_del_LDADD = ../src/libnetfilter_conntrack.la
-nfct_mnl_del_LDFLAGS = -dynamic -ldl -lmnl
+nfct_mnl_del_LDADD = ../src/libnetfilter_conntrack.la -ldl ${LIBMNL_LIBS}
+nfct_mnl_del_LDFLAGS = -dynamic
nfct_mnl_dump_SOURCES = nfct-mnl-dump.c
-nfct_mnl_dump_LDADD = ../src/libnetfilter_conntrack.la
-nfct_mnl_dump_LDFLAGS = -dynamic -ldl -lmnl
+nfct_mnl_dump_LDADD = ../src/libnetfilter_conntrack.la -ldl ${LIBMNL_LIBS}
+nfct_mnl_dump_LDFLAGS = -dynamic
nfct_mnl_dump_labels_SOURCES = nfct-mnl-dump-labels.c
-nfct_mnl_dump_labels_LDADD = ../src/libnetfilter_conntrack.la
-nfct_mnl_dump_labels_LDFLAGS = -dynamic -ldl -lmnl
+nfct_mnl_dump_labels_LDADD = ../src/libnetfilter_conntrack.la -ldl ${LIBMNL_LIBS}
+nfct_mnl_dump_labels_LDFLAGS = -dynamic
nfct_mnl_set_label_SOURCES = nfct-mnl-set-label.c
-nfct_mnl_set_label_LDADD = ../src/libnetfilter_conntrack.la
-nfct_mnl_set_label_LDFLAGS = -dynamic -ldl -lmnl
+nfct_mnl_set_label_LDADD = ../src/libnetfilter_conntrack.la -ldl ${LIBMNL_LIBS}
+nfct_mnl_set_label_LDFLAGS = -dynamic
nfct_mnl_event_SOURCES = nfct-mnl-event.c
-nfct_mnl_event_LDADD = ../src/libnetfilter_conntrack.la
-nfct_mnl_event_LDFLAGS = -dynamic -ldl -lmnl
+nfct_mnl_event_LDADD = ../src/libnetfilter_conntrack.la -ldl ${LIBMNL_LIBS}
+nfct_mnl_event_LDFLAGS = -dynamic
nfct_mnl_flush_SOURCES = nfct-mnl-flush.c
-nfct_mnl_flush_LDADD = ../src/libnetfilter_conntrack.la
-nfct_mnl_flush_LDFLAGS = -dynamic -ldl -lmnl
+nfct_mnl_flush_LDADD = ../src/libnetfilter_conntrack.la -ldl ${LIBMNL_LIBS}
+nfct_mnl_flush_LDFLAGS = -dynamic
nfct_mnl_get_SOURCES = nfct-mnl-get.c
-nfct_mnl_get_LDADD = ../src/libnetfilter_conntrack.la
-nfct_mnl_get_LDFLAGS = -dynamic -ldl -lmnl
+nfct_mnl_get_LDADD = ../src/libnetfilter_conntrack.la -ldl ${LIBMNL_LIBS}
+nfct_mnl_get_LDFLAGS = -dynamic
nfexp_mnl_dump_SOURCES = nfexp-mnl-dump.c
-nfexp_mnl_dump_LDADD = ../src/libnetfilter_conntrack.la
-nfexp_mnl_dump_LDFLAGS = -dynamic -ldl -lmnl
+nfexp_mnl_dump_LDADD = ../src/libnetfilter_conntrack.la -ldl ${LIBMNL_LIBS}
+nfexp_mnl_dump_LDFLAGS = -dynamic
nfexp_mnl_event_SOURCES = nfexp-mnl-event.c
-nfexp_mnl_event_LDADD = ../src/libnetfilter_conntrack.la
-nfexp_mnl_event_LDFLAGS = -dynamic -ldl -lmnl
+nfexp_mnl_event_LDADD = ../src/libnetfilter_conntrack.la -ldl ${LIBMNL_LIBS}
+nfexp_mnl_event_LDFLAGS = -dynamic
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH libnetfilter_conntrack 2/2] Update .gitignore
2020-11-30 13:21 [PATCH libnetfilter_conntrack 1/2] build: use the right automake variables Jan Engelhardt
@ 2020-11-30 13:21 ` Jan Engelhardt
2020-12-08 12:08 ` [PATCH libnetfilter_conntrack 1/2] build: use the right automake variables Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Jan Engelhardt @ 2020-11-30 13:21 UTC (permalink / raw)
To: fw; +Cc: netfilter-devel
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
.gitignore | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git .gitignore .gitignore
index e90dec6..d919db1 100644
--- .gitignore
+++ .gitignore
@@ -16,3 +16,16 @@ Makefile.in
/doxygen.cfg
/*.pc
+
+/examples/nfct-mnl-create
+/examples/nfct-mnl-del
+/examples/nfct-mnl-dump
+/examples/nfct-mnl-dump-labels
+/examples/nfct-mnl-event
+/examples/nfct-mnl-flush
+/examples/nfct-mnl-get
+/examples/nfct-mnl-set-label
+/examples/nfexp-mnl-dump
+/examples/nfexp-mnl-event
+/tests/test_connlabel
+/utils/expect_create_nat
--
2.29.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH libnetfilter_conntrack 1/2] build: use the right automake variables
2020-11-30 13:21 [PATCH libnetfilter_conntrack 1/2] build: use the right automake variables Jan Engelhardt
2020-11-30 13:21 ` [PATCH libnetfilter_conntrack 2/2] Update .gitignore Jan Engelhardt
@ 2020-12-08 12:08 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2020-12-08 12:08 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: fw, netfilter-devel
Applied, patch 1/2 and 2/2, thanks Jan.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-08 12:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-30 13:21 [PATCH libnetfilter_conntrack 1/2] build: use the right automake variables Jan Engelhardt
2020-11-30 13:21 ` [PATCH libnetfilter_conntrack 2/2] Update .gitignore Jan Engelhardt
2020-12-08 12:08 ` [PATCH libnetfilter_conntrack 1/2] build: use the right automake variables 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).