From f64ebab092a3760bad711ef3cbb323c6ee60be1d Mon Sep 17 00:00:00 2001 From: Gery Kahn Date: Thu, 11 Nov 2010 23:21:18 +0200 Subject: Add all libraries for libtool to improve linkage This will fix finding libs while link, by adding them to LDFLAGS [It's no ideal but it's less of a mess than what we have now. -tgraf] Signed-off-by: Gery Kahn --- src/Makefile.am | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 895c8ae..76a541a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = lib AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -AM_LDFLAGS = -L${top_builddir}/lib -L${top_builddir}/src/lib -lnl-cli +AM_LDFLAGS = -L${top_builddir}/lib -L${top_builddir}/src/lib -lnl-cli -lnl -lnl-nf -lnl-genl -lnl-route sbin_PROGRAMS = \ nl-qdisc-add nl-qdisc-list nl-qdisc-delete \ @@ -29,97 +29,58 @@ noinst_PROGRAMS = \ nl-util-addr genl_ctrl_list_SOURCES = genl-ctrl-list.c -genl_ctrl_list_LDADD = -lnl-genl -lnl-route nf_ct_list_SOURCES = nf-ct-list.c -nf_ct_list_LDADD = -lnl-nf nf_log_SOURCES = nf-log.c -nf_log_LDADD = -lnl-nf nf_queue_SOURCES = nf-queue.c -nf_queue_LDADD = -lnl-nf nf_monitor_SOURCES = nf-monitor.c -nf_monitor_LDADD = -lnl-nf nl_addr_add_SOURCES = nl-addr-add.c -nl_addr_add_LDADD = -lnl-route nl_addr_delete_SOURCES = nl-addr-delete.c -nl_addr_delete_LDADD = -lnl-route nl_addr_list_SOURCES = nl-addr-list.c -nl_addr_list_LDADD = -lnl-route nl_link_list_SOURCES = nl-link-list.c -nl_link_list_LDADD = -lnl-route nl_link_set_SOURCES = nl-link-set.c -nl_link_set_LDADD = -lnl-route nl_link_stats_SOURCES = nl-link-stats.c -nl_link_stats_LDADD = -lnl-route nl_link_ifindex2name_SOURCES = nl-link-ifindex2name.c -nl_link_ifindex2name_LDADD = -lnl-route nl_link_name2ifindex_SOURCES = nl-link-name2ifindex.c -nl_link_name2ifindex_LDADD = -lnl-route nl_monitor_SOURCES = nl-monitor.c -nl_monitor_LDADD = -lnl-route nl_neigh_add_SOURCES = nl-neigh-add.c -nl_neigh_add_LDADD = -lnl-route nl_neigh_delete_SOURCES = nl-neigh-delete.c -nl_neigh_delete_LDADD = -lnl-route nl_neigh_list_SOURCES = nl-neigh-list.c -nl_neigh_list_LDADD = -lnl-route nl_neightbl_list_SOURCES = nl-neightbl-list.c -nl_neightbl_list_LDADD = -lnl-route nl_qdisc_add_SOURCES = nl-qdisc-add.c -nl_qdisc_add_LDADD = -lnl-route nl_qdisc_delete_SOURCES = nl-qdisc-delete.c -nl_qdisc_delete_LDADD = -lnl-route nl_qdisc_list_SOURCES = nl-qdisc-list.c -nl_qdisc_list_LDADD = -lnl-route nl_class_add_SOURCES = nl-class-add.c -nl_class_add_LDADD = -lnl-route nl_class_delete_SOURCES = nl-class-delete.c -nl_class_delete_LDADD = -lnl-route nl_class_list_SOURCES = nl-class-list.c -nl_class_list_LDADD = -lnl-route nl_cls_add_SOURCES = nl-cls-add.c -nl_cls_add_LDADD = -lnl-route nl_cls_list_SOURCES = nl-cls-list.c -nl_cls_list_LDADD = -lnl-route nl_cls_delete_SOURCES = nl-cls-delete.c -nl_cls_delete_LDADD = -lnl-route nl_route_add_SOURCES = nl-route-add.c -nl_route_add_LDADD = -lnl-route nl_route_delete_SOURCES = nl-route-delete.c -nl_route_delete_LDADD = -lnl-route nl_route_get_SOURCES = nl-route-get.c -nl_route_get_LDADD = -lnl-route nl_route_list_SOURCES = nl-route-list.c -nl_route_list_LDADD = -lnl-route nl_rule_list_SOURCES = nl-rule-list.c -nl_rule_list_LDADD = -lnl-route nl_tctree_list_SOURCES = nl-tctree-list.c -nl_tctree_list_LDADD = -lnl-route nl_fib_lookup_SOURCES = nl-fib-lookup.c -nl_fib_lookup_LDADD = -lnl-route nl_list_caches_SOURCES = nl-list-caches.c -nl_list_caches_LDADD = -lnl-route nl_list_sockets_SOURCES = nl-list-sockets.c -nl_list_sockets_LDADD = -lnl-route nl_util_addr_SOURCES = nl-util-addr.c -nl_util_addr_LDADD = -lnl-route nl_pktloc_lookup_SOURCES = nl-pktloc-lookup.c -nl_pktloc_lookup_LDADD = -lnl-route nl_classid_lookup_SOURCES = nl-classid-lookup.c -nl_classid_lookup_LDADD = -lnl-route -- cgit v0.12