diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-04-01 11:44:59 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2013-04-01 11:44:59 +0200 |
| commit | d2b5cbd88ad9af1fc749b22f19dad9c15d6cbb85 (patch) | |
| tree | 8edc879632989f8a5ea1664f03e83f999c8e0efa /Makefile.am | |
| parent | 94cd080452720149008a9c25a9364c5a4d3ccae7 (diff) | |
| parent | 6c9be5a31681ddf9a669ecf643092928ab0f2138 (diff) | |
Merge git://git.infradead.org/users/tgr/libnl
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/linux/netlink.h
lib/Makefile.am
lib/error.c
libnl-3.0.pc.in
src/Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 5931a9e..bc4266d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,19 +2,21 @@ ACLOCAL_AMFLAGS = -I m4 -OPT_DIRS = +SUBDIRS = include lib man python tests + +pkgconfig_DATA = libnl-3.0.pc \ + libnl-route-3.0.pc \ + libnl-genl-3.0.pc \ + libnl-nf-3.0.pc if ENABLE_CLI -OPT_DIRS += src +SUBDIRS += src +pkgconfig_DATA += libnl-cli-3.0.pc endif -SUBDIRS = include lib doc man $(OPT_DIRS) - -pkgconfig_DATA = libnl-3.0.pc -sysconfdir = @sysconfdir@/libnl -sysconf_DATA = etc/pktloc etc/classid +pkgsysconfdir = ${sysconfdir}/libnl +pkgsysconf_DATA = etc/pktloc etc/classid -.PHONY: cscope -cscope: - cscope -b -q -R -Iinclude -slib -ssrc; +EXTRA_DIST = \ + $(pkgsysconf_DATA) |