diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-03-21 14:16:40 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-03-21 14:23:51 +0100 |
| commit | 2cb7425fef5645631bb81cb06df0c3e73b461f01 (patch) | |
| tree | 400b069d5a6c4a218842f9a35575846e92cca28f | |
| parent | aaf404533ace3c8a355b28deb12793fb11ef3c2a (diff) | |
Export libnftables (again)
This reverts commits d572d59788143945c2a638f12a5227d9b21ce489 and
9f5e49e147219cd161de8cd80cadf8a444969ef0.
Current libnftables API should be stable enough to release it into the
public, and after 4aba100e593f ("rule: reset cache iff there is an
existing cache") we have a simple way to batch commands through this
API.
Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libnftables.pc.in | 15 | ||||
| -rw-r--r-- | src/.gitignore | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
5 files changed, 21 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 5ef61be6..1201ca78 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,3 +6,6 @@ SUBDIRS = src \ EXTRA_DIST = tests \ files + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libnftables.pc diff --git a/configure.ac b/configure.ac index 6c6b9b3a..284bcc50 100644 --- a/configure.ac +++ b/configure.ac @@ -109,6 +109,7 @@ AM_CONDITIONAL([BUILD_XTABLES], [test "x$with_libxtables" == xyes]) AC_CONFIG_FILES([ \ Makefile \ + libnftables.pc \ src/Makefile \ include/Makefile \ include/nftables/Makefile \ diff --git a/libnftables.pc.in b/libnftables.pc.in new file mode 100644 index 00000000..6431d48c --- /dev/null +++ b/libnftables.pc.in @@ -0,0 +1,15 @@ +# libnftables pkg-config file + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libnftables +Description: Netfilter nf_tables user library +URL: http://netfilter.org/projects/nftables/ +Version: @VERSION@ +Requires: +Conflicts: +Libs: -L${libdir} -lnftables +Cflags: -I${includedir} diff --git a/src/.gitignore b/src/.gitignore index e27d4f84..36d6acd1 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,4 +1,3 @@ -libnftables.a libnftables.la parser.c parser.h diff --git a/src/Makefile.am b/src/Makefile.am index 677ca396..92e6795f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ AM_YFLAGS = -d BUILT_SOURCES = parser_bison.h -noinst_LTLIBRARIES = libnftables.la +lib_LTLIBRARIES = libnftables.la libnftables_la_SOURCES = \ rule.c \ @@ -58,7 +58,7 @@ libnftables_la_SOURCES = \ libnftables.c # yacc and lex generate dirty code -noinst_LTLIBRARIES += libparser.la +noinst_LTLIBRARIES = libparser.la libparser_la_SOURCES = parser_bison.y scanner.l libparser_la_CFLAGS = ${AM_CFLAGS} \ -Wno-missing-prototypes \ |