Merge remote-tracking branch 'upstream_linaro/linaro-libnl2_0'

* upstream_linaro/linaro-libnl2_0: (159 commits)
  Updating group definition to follow 3.13 kernel
  Adding version.h
  Adding support for netlink API and quota in nfaccounting
  Compile 2.0 with Kitkat
  Don't include pktloc_syntax.h in BUILT_SOURCES
  route_obj: don't add empty destination to nlmsg
  automake: add ${top_builddir}/include to AM_CFLAGS
  Use CPPFLAGS
  Put preprocessor definitions in AM_CPPFLAGS
  add user data to change_func_t for caches
  Trivial fix for TBF memleak
  libnl: optionally disable cli tools.
  Ignore vim swap files
  Let git ignore generated pktloc source files
  Fix compile warning in utils.c
  Fix compile warning in nl.c
  Packet Location Interface
  src/nf-queue.c: cleanup and improve performance of test program for NF_QUEUE
  Don't install private header files.
  object: fix attribute comparison
  ...

Conflicts:
	Android.mk
	include/linux/netfilter/nfnetlink.h

Change-Id: I383749ca16113b2ae8cfc7729aee8bbc8a36dc9e

1 files changed, 20 insertions, 0 deletions

diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..8f9438c
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,20 @@
+# -*- Makefile -*-
+
+ACLOCAL_AMFLAGS = -I m4
+
+OPT_DIRS =
+
+if ENABLE_CLI
+OPT_DIRS += src
+endif
+
+SUBDIRS = include lib doc $(OPT_DIRS)
+
+pkgconfig_DATA = libnl-2.0.pc
+
+sysconfdir = @sysconfdir@/libnl
+sysconf_DATA = etc/pktloc
+
+.PHONY: cscope
+cscope:
+	cscope -b -q -R -Iinclude -slib -ssrc;