From fed168212ecfd179691813b67959fa20593d23dd Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Thu, 5 Nov 2009 13:38:00 +0100 Subject: 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 --- src/Makefile.am | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 0ffc26f..1f2fe70 100644 --- 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 -- cgit v1.2.1