netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH] Make libnftables a local static library
Date: Thu, 30 Nov 2017 18:11:24 +0100	[thread overview]
Message-ID: <20171130171124.24408-1-phil@nwl.cc> (raw)
In-Reply-To: <20171124140246.GA6881@salvia>

This changes Makefiles so that libnftables is built into a static
library which is not installed. This allows for incompatible changes
while still providing a library to link to for testing purposes.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 Makefile.am     |  3 ---
 src/Makefile.am | 14 ++++++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9af25ded836b8..10aa40f14127f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,3 @@ SUBDIRS = 	src	\
 		files
 
 EXTRA_DIST =	tests
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libnftables.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 9f7a4bfbb90a4..07ddfd590dd8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,9 +27,9 @@ parser_bison.o scanner.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-decl
 
 BUILT_SOURCES = parser_bison.h
 
-lib_LTLIBRARIES = libnftables.la
+noinst_LIBRARIES = libnftables.a
 
-libnftables_la_SOURCES =			\
+libnftables_a_SOURCES =				\
 		rule.c				\
 		statement.c			\
 		datatype.c			\
@@ -64,14 +64,14 @@ libnftables_la_SOURCES =			\
 if BUILD_MINIGMP
 mini-gmp.o: AM_CFLAGS += -Wno-sign-compare
 
-libnftables_la_SOURCES += mini-gmp.c
+libnftables_a_SOURCES += mini-gmp.c
 endif
 
-libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBNFTNL_LIBS}
+nft_LDADD = libnftables.a ${LIBMNL_LIBS} ${LIBNFTNL_LIBS}
 
 if BUILD_XTABLES
-libnftables_la_SOURCES += xt.c
-libnftables_la_LIBADD += ${XTABLES_LIBS}
+libnftables_a_SOURCES += xt.c
+nft_LDADD += ${XTABLES_LIBS}
 endif
 
 nft_SOURCES = main.c
@@ -79,5 +79,3 @@ nft_SOURCES = main.c
 if BUILD_CLI
 nft_SOURCES += cli.c
 endif
-
-nft_LDADD = libnftables.la
-- 
2.13.1


  reply	other threads:[~2017-11-30 17:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-24 14:02 static libnftables by now? Pablo Neira Ayuso
2017-11-30 17:11 ` Phil Sutter [this message]
2017-11-30 17:36   ` [nft PATCH] Make libnftables a local static library Jan Engelhardt
2017-11-30 18:30     ` Phil Sutter
2017-11-30 18:36       ` [nft PATCH v2] " Phil Sutter
2017-12-04 10:06         ` Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171130171124.24408-1-phil@nwl.cc \
    --to=phil@nwl.cc \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).