This reverts commits d572d59788143945c2a638f12a5227d9b21ce489 and 9f5e49e147219cd161de8cd80cadf8a444969ef0. Current libnftables API should be stable enough to release it into the public. Suggested-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> Signed-off-by: Phil Sutter <phil@xxxxxx> --- Makefile.am | 3 +++ configure.ac | 1 + libnftables.pc.in | 15 +++++++++++++++ src/.gitignore | 1 - src/Makefile.am | 4 ++-- 5 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 libnftables.pc.in diff --git a/Makefile.am b/Makefile.am index 5ef61be6dfecb..1201ca78e4f17 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 6c6b9b3a4c4bb..284bcc502346a 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 0000000000000..6431d48cf6f2c --- /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 e27d4f8431eec..36d6acd1e4d01 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 677ca3969c858..92e6795f659aa 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 \ -- 2.16.1 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
