libnl: fix automake breakage

libnl-route must be handled before libnl-nf in lib_LTLIBRARIES since
the later depends on the former. Additionally nf-monitor, nl-list-caches,
nl-list-sockets and nl-util-addr have been dropped from the Makefile.

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3c1dca709bacd6bda2cdc7229acbc1e7e555e59b..1c2ae99476b88d1f6b11bb5fbf0040d69be732a9 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,7 +3,7 @@
 AM_CFLAGS  = -Wall -I${top_srcdir}/include -D_GNU_SOURCE
 
 lib_LTLIBRARIES = \
-       libnl.la libnl-genl.la libnl-nf.la libnl-route.la
+       libnl.la libnl-genl.la libnl-route.la libnl-nf.la
 
 libnl_la_LDFLAGS = -version-info 2:0:0
 libnl_la_SOURCES = \

diff --git a/src/Makefile.am b/src/Makefile.am
index 0ffc26f350de67f14ee911c626ae33503c8de983..1f2fe708807e409c2b7ca9555b5169f5ebb43c03 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ AM_LDFLAGS = -L${top_builddir}/lib
 
 noinst_PROGRAMS = \
        genl-ctrl-list \
-       nf-ct-list nf-log nf-queue \
+       nf-ct-list nf-log nf-queue nf-monitor \
        nl-addr-add nl-addr-delete nl-addr-list \
        nl-link-list nl-link-set nl-link-stats \
        nl-link-ifindex2name nl-link-name2ifindex \
@@ -15,7 +15,10 @@ noinst_PROGRAMS = \
        nl-neightbl-list \
        nl-monitor \
        nl-tctree-list \
-       nl-route-add nl-route-delete nl-route-get nl-route-list
+       nl-route-add nl-route-delete nl-route-get nl-route-list \
+       nl-fib-lookup \
+       nl-list-caches nl-list-sockets \
+       nl-util-addr
 
 rtnl_utils_c = rtnl-utils.c utils.c
 
@@ -28,6 +31,8 @@ nf_log_SOURCES = nf-log.c log-utils.c ${rtnl_utils_c}
 nf_log_LDADD = -lnl-nf
 nf_queue_SOURCES = nf-queue.c queue-utils.c ${rtnl_utils_c}
 nf_queue_LDADD = -lnl-nf
+nf_monitor_SOURCES = nf-monitor.c utils.c
+nf_monitor_LDADD = -lnl-nf
 
 addr_c = addr-utils.c ${rtnl_utils_c}
 nl_addr_add_SOURCES = nl-addr-add.c ${addr_c}
@@ -84,3 +89,14 @@ nl_rule_list_LDADD = -lnl-route
 
 nl_tctree_list_SOURCES = nl-tctree-list.c ${rtnl_utils_c}
 nl_tctree_list_LDADD = -lnl-route
+
+nl_fib_lookup_SOURCES = nl-fib-lookup.c ${rtnl_utils_c}
+nl_fib_lookup_LDADD = -lnl-route
+
+nl_list_caches_SOURCES = nl-list-caches.c ${rtnl_utils_c}
+nl_list_caches_LDADD = -lnl-route
+nl_list_sockets_SOURCES = nl-list-sockets.c ${rtnl_utils_c}
+nl_list_sockets_LDADD = -lnl-route
+
+nl_util_addr_SOURCES = nl-util-addr.c ${rtnl_utils_c}
+nl_util_addr_LDADD = -lnl-route