[PATCH libnetfilter_queue 1/2] build: choose right automake variables

[PATCH libnetfilter_queue 1/2] build: choose right automake variables

[Jan Engelhardt]

-l is a library selection, needs to go into _LDADD/_LIBADD.

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 examples/Makefile.am | 4 ++--
 src/Makefile.am      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git examples/Makefile.am examples/Makefile.am
index 1906697..97bb70c 100644
--- examples/Makefile.am
+++ examples/Makefile.am
@@ -3,5 +3,5 @@ include ${top_srcdir}/Make_global.am
 check_PROGRAMS = nf-queue
 
 nf_queue_SOURCES = nf-queue.c
-nf_queue_LDADD = ../src/libnetfilter_queue.la
-nf_queue_LDFLAGS = -dynamic -lmnl
+nf_queue_LDADD = ../src/libnetfilter_queue.la -lmnl
+nf_queue_LDFLAGS = -dynamic
diff --git src/Makefile.am src/Makefile.am
index ab2a151..8cede12 100644
--- src/Makefile.am
+++ src/Makefile.am
@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libnetfilter_queue.la
 
 noinst_HEADERS = internal.h
 
-libnetfilter_queue_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \
+libnetfilter_queue_la_LDFLAGS = -Wc,-nostartfiles \
 				-version-info $(LIBVERSION)
 libnetfilter_queue_la_SOURCES = libnetfilter_queue.c	\
 				nlmsg.c			\
-- 
2.29.2

[PATCH libnetfilter_queue 2/2] Update .gitignore

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git .gitignore .gitignore
index a0fc139..525628e 100644
--- .gitignore
+++ .gitignore
@@ -2,6 +2,7 @@
 .libs/
 Makefile
 Makefile.in
+.dirstamp
 *.o
 *.la
 *.lo
@@ -12,6 +13,9 @@ Makefile.in
 /config.*
 /configure
 /libtool
+/stamp-h1
 
 /doxygen.cfg
 /libnetfilter_queue.pc
+
+/examples/nf-queue
-- 
2.29.2

Re: [PATCH libnetfilter_queue 1/2] build: choose right automake variables

[Pablo Neira Ayuso]

Applied patch 1/2 and 2/2, thanks Jan.