summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-02-03 14:04:42 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-02-03 18:43:13 +0100
commit29fd6a1df9f6c80d155a7a73b8514a68dc9cd22d (patch)
tree9dc15a3e19a6ff36ae9ee3d38c7b8190b73f0a72 /src/Makefile.am
parent16871a3615edcf358d688a8d079b1e7b20053fb1 (diff)
parent076fd1e66e7f1bc3b2bd91f3efb84080da26fb9c (diff)
Merge branch 'master' into next-3.14
This patch includes changes to adapt this branch to the library rename that happened in the master branch. Conflicts: src/Makefile.am src/expr/cmp.c src/expr/ct.c src/expr/data_reg.c src/expr/meta.c tests/jsonfiles/01-table.json tests/jsonfiles/02-table.json tests/jsonfiles/64-ruleset.json tests/xmlfiles/01-table.xml tests/xmlfiles/02-table.xml
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am76
1 files changed, 38 insertions, 38 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 441e96e..450279f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,40 +1,40 @@
include $(top_srcdir)/Make_global.am
-lib_LTLIBRARIES = libnftables.la
+lib_LTLIBRARIES = libnftnl.la
-libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS}
-libnftables_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnftables.map \
- -version-info $(LIBVERSION)
-libnftables_la_SOURCES = utils.c \
- common.c \
- table.c \
- chain.c \
- rule.c \
- set.c \
- set_elem.c \
- ruleset.c \
- mxml.c \
- jansson.c \
- expr.c \
- expr_ops.c \
- expr/bitwise.c \
- expr/byteorder.c \
- expr/cmp.c \
- expr/counter.c \
- expr/ct.c \
- expr/data_reg.c \
- expr/exthdr.c \
- expr/limit.c \
- expr/log.c \
- expr/lookup.c \
- expr/immediate.c \
- expr/match.c \
- expr/meta.c \
- expr/nat.c \
- expr/payload.c \
- expr/queue.c \
- expr/reject.c \
- expr/target.c \
- expr/data_reg.h \
- libnftables.map \
- expr_ops.h \
- internal.h
+libnftnl_la_LIBADD = ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS}
+libnftnl_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnftnl.map \
+ -version-info $(LIBVERSION)
+
+libnftnl_la_SOURCES = utils.c \
+ common.c \
+ table.c \
+ chain.c \
+ rule.c \
+ set.c \
+ set_elem.c \
+ ruleset.c \
+ mxml.c \
+ jansson.c \
+ expr.c \
+ expr_ops.c \
+ expr/bitwise.c \
+ expr/byteorder.c \
+ expr/cmp.c \
+ expr/counter.c \
+ expr/ct.c \
+ expr/data_reg.c \
+ expr/exthdr.c \
+ expr/limit.c \
+ expr/log.c \
+ expr/lookup.c \
+ expr/immediate.c \
+ expr/match.c \
+ expr/meta.c \
+ expr/nat.c \
+ expr/payload.c \
+ expr/reject.c \
+ expr/target.c \
+ expr/data_reg.h \
+ libnftnl.map \
+ expr_ops.h \
+ internal.h