From patchwork Mon Nov 30 13:21:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 1408230 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=inai.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Cl5WW6KG2z9sSf for ; Tue, 1 Dec 2020 00:22:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726120AbgK3NWc (ORCPT ); Mon, 30 Nov 2020 08:22:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726063AbgK3NWc (ORCPT ); Mon, 30 Nov 2020 08:22:32 -0500 Received: from a3.inai.de (a3.inai.de [IPv6:2a01:4f8:10b:45d8::f5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8AD4C0613CF for ; Mon, 30 Nov 2020 05:21:51 -0800 (PST) Received: by a3.inai.de (Postfix, from userid 65534) id 3CF3559BD62CB; Mon, 30 Nov 2020 14:21:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on a3.inai.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from a4.inai.de (a4.inai.de [IPv6:2a01:4f8:10b:45d8::f8]) by a3.inai.de (Postfix) with ESMTP id A4A9759BD6294; Mon, 30 Nov 2020 14:21:49 +0100 (CET) From: Jan Engelhardt To: fw@strlen.de Cc: netfilter-devel@vger.kernel.org Subject: [PATCH libnetfilter_conntrack 1/2] build: use the right automake variables Date: Mon, 30 Nov 2020 14:21:48 +0100 Message-Id: <20201130132149.32227-1-jengelh@inai.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org -l is a library selection and needs to go into _LDADD/_LIBADD. Signed-off-by: Jan Engelhardt --- 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 From patchwork Mon Nov 30 13:21:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 1408229 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=inai.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Cl5WX3C8dz9sSs for ; Tue, 1 Dec 2020 00:22:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726410AbgK3NWe (ORCPT ); Mon, 30 Nov 2020 08:22:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726162AbgK3NWc (ORCPT ); Mon, 30 Nov 2020 08:22:32 -0500 Received: from a3.inai.de (a3.inai.de [IPv6:2a01:4f8:10b:45d8::f5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F64EC0613D2 for ; Mon, 30 Nov 2020 05:21:52 -0800 (PST) Received: by a3.inai.de (Postfix, from userid 65534) id B969A59BD62E7; Mon, 30 Nov 2020 14:21:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on a3.inai.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from a4.inai.de (a4.inai.de [IPv6:2a01:4f8:10b:45d8::f8]) by a3.inai.de (Postfix) with ESMTP id AA29859BD62B7; Mon, 30 Nov 2020 14:21:49 +0100 (CET) From: Jan Engelhardt To: fw@strlen.de Cc: netfilter-devel@vger.kernel.org Subject: [PATCH libnetfilter_conntrack 2/2] Update .gitignore Date: Mon, 30 Nov 2020 14:21:49 +0100 Message-Id: <20201130132149.32227-2-jengelh@inai.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201130132149.32227-1-jengelh@inai.de> References: <20201130132149.32227-1-jengelh@inai.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Jan Engelhardt --- .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