build: merge src/Makefile.am into top-level makefile

diff --git a/Makefile.am b/Makefile.am
index 42c1f5132fc63ebc6d1a0703d0853b7b989ed243..7cdd7d4b8e27d7c83d5f6053c89b03e11f90825a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,18 +2,15 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = \
-       .
-
-if ENABLE_CLI
-SUBDIRS += src
-endif
-
 lib_LTLIBRARIES =
 
 check_PROGRAMS =
 check_programs =
 
+bin_PROGRAMS =
+sbin_PROGRAMS =
+noinst_PROGRAMS =
+
 TESTS =
 
 CLEANFILES =
@@ -577,6 +574,177 @@ src_lib_libnl_cli_3_la_LIBADD = \
 
 ###############################################################################
 
+src_cppflags = \
+       -Wall \
+       -D_GNU_SOURCE \
+       -DSYSCONFDIR=\"$(sysconfdir)/libnl\" \
+       -I$(srcdir)/include/linux-private \
+       -I$(srcdir)/include \
+       -I$(builddir)/include
+
+src_ldadd = \
+       src/lib/libnl-cli-3.la \
+       lib/libnl-3.la \
+       lib/libnl-nf-3.la \
+       lib/libnl-genl-3.la \
+       lib/libnl-route-3.la \
+       lib/libnl-idiag-3.la
+
+cli_programs = \
+       src/genl-ctrl-list \
+       src/idiag-socket-details \
+       src/nf-ct-add \
+       src/nf-ct-list \
+       src/nf-exp-add \
+       src/nf-exp-delete \
+       src/nf-exp-list \
+       src/nf-log \
+       src/nf-monitor \
+       src/nf-queue \
+       src/nl-addr-add \
+       src/nl-addr-delete \
+       src/nl-addr-list \
+       src/nl-class-add \
+       src/nl-class-delete \
+       src/nl-class-list \
+       src/nl-classid-lookup \
+       src/nl-cls-add \
+       src/nl-cls-delete \
+       src/nl-cls-list \
+       src/nl-fib-lookup \
+       src/nl-link-enslave \
+       src/nl-link-ifindex2name \
+       src/nl-link-list \
+       src/nl-link-name2ifindex \
+       src/nl-link-release \
+       src/nl-link-set \
+       src/nl-link-stats \
+       src/nl-list-caches \
+       src/nl-list-sockets \
+       src/nl-monitor \
+       src/nl-neigh-add \
+       src/nl-neigh-delete \
+       src/nl-neigh-list \
+       src/nl-neightbl-list \
+       src/nl-pktloc-lookup \
+       src/nl-qdisc-add \
+       src/nl-qdisc-delete \
+       src/nl-qdisc-list \
+       src/nl-route-add \
+       src/nl-route-delete \
+       src/nl-route-get \
+       src/nl-route-list \
+       src/nl-rule-list \
+       src/nl-tctree-list \
+       src/nl-util-addr
+
+if ENABLE_CLI
+if ENABLE_CLI_INSTALL_BIN
+bin_PROGRAMS += $(cli_programs)
+else
+if ENABLE_CLI_INSTALL_SBIN
+sbin_PROGRAMS += $(cli_programs)
+else
+noinst_PROGRAMS += $(cli_programs)
+endif
+endif
+endif
+
+src_genl_ctrl_list_CPPFLAGS =       $(src_cppflags)
+src_genl_ctrl_list_LDADD =          $(src_ldadd)
+src_idiag_socket_details_CPPFLAGS = $(src_cppflags)
+src_idiag_socket_details_LDADD =    $(src_ldadd)
+src_nf_ct_add_CPPFLAGS =            $(src_cppflags)
+src_nf_ct_add_LDADD =               $(src_ldadd)
+src_nf_ct_list_CPPFLAGS =           $(src_cppflags)
+src_nf_ct_list_LDADD =              $(src_ldadd)
+src_nf_exp_add_CPPFLAGS =           $(src_cppflags)
+src_nf_exp_add_LDADD =              $(src_ldadd)
+src_nf_exp_delete_CPPFLAGS =        $(src_cppflags)
+src_nf_exp_delete_LDADD =           $(src_ldadd)
+src_nf_exp_list_CPPFLAGS =          $(src_cppflags)
+src_nf_exp_list_LDADD =             $(src_ldadd)
+src_nf_log_CPPFLAGS =               $(src_cppflags)
+src_nf_log_LDADD =                  $(src_ldadd)
+src_nf_monitor_CPPFLAGS =           $(src_cppflags)
+src_nf_monitor_LDADD =              $(src_ldadd)
+src_nf_queue_CPPFLAGS =             $(src_cppflags)
+src_nf_queue_LDADD =                $(src_ldadd)
+src_nl_addr_add_CPPFLAGS =          $(src_cppflags)
+src_nl_addr_add_LDADD =             $(src_ldadd)
+src_nl_addr_delete_CPPFLAGS =       $(src_cppflags)
+src_nl_addr_delete_LDADD =          $(src_ldadd)
+src_nl_addr_list_CPPFLAGS =         $(src_cppflags)
+src_nl_addr_list_LDADD =            $(src_ldadd)
+src_nl_class_add_CPPFLAGS =         $(src_cppflags)
+src_nl_class_add_LDADD =            $(src_ldadd)
+src_nl_class_delete_CPPFLAGS =      $(src_cppflags)
+src_nl_class_delete_LDADD =         $(src_ldadd)
+src_nl_class_list_CPPFLAGS =        $(src_cppflags)
+src_nl_class_list_LDADD =           $(src_ldadd)
+src_nl_classid_lookup_CPPFLAGS =    $(src_cppflags)
+src_nl_classid_lookup_LDADD =       $(src_ldadd)
+src_nl_cls_add_CPPFLAGS =           $(src_cppflags)
+src_nl_cls_add_LDADD =              $(src_ldadd)
+src_nl_cls_delete_CPPFLAGS =        $(src_cppflags)
+src_nl_cls_delete_LDADD =           $(src_ldadd)
+src_nl_cls_list_CPPFLAGS =          $(src_cppflags)
+src_nl_cls_list_LDADD =             $(src_ldadd)
+src_nl_fib_lookup_CPPFLAGS =        $(src_cppflags)
+src_nl_fib_lookup_LDADD =           $(src_ldadd)
+src_nl_link_enslave_CPPFLAGS =      $(src_cppflags)
+src_nl_link_enslave_LDADD =         $(src_ldadd)
+src_nl_link_ifindex2name_CPPFLAGS = $(src_cppflags)
+src_nl_link_ifindex2name_LDADD =    $(src_ldadd)
+src_nl_link_list_CPPFLAGS =         $(src_cppflags)
+src_nl_link_list_LDADD =            $(src_ldadd)
+src_nl_link_name2ifindex_CPPFLAGS = $(src_cppflags)
+src_nl_link_name2ifindex_LDADD =    $(src_ldadd)
+src_nl_link_release_CPPFLAGS =      $(src_cppflags)
+src_nl_link_release_LDADD =         $(src_ldadd)
+src_nl_link_set_CPPFLAGS =          $(src_cppflags)
+src_nl_link_set_LDADD =             $(src_ldadd)
+src_nl_link_stats_CPPFLAGS =        $(src_cppflags)
+src_nl_link_stats_LDADD =           $(src_ldadd)
+src_nl_list_caches_CPPFLAGS =       $(src_cppflags)
+src_nl_list_caches_LDADD =          $(src_ldadd)
+src_nl_list_sockets_CPPFLAGS =      $(src_cppflags)
+src_nl_list_sockets_LDADD =         $(src_ldadd)
+src_nl_monitor_CPPFLAGS =           $(src_cppflags)
+src_nl_monitor_LDADD =              $(src_ldadd)
+src_nl_neigh_add_CPPFLAGS =         $(src_cppflags)
+src_nl_neigh_add_LDADD =            $(src_ldadd)
+src_nl_neigh_delete_CPPFLAGS =      $(src_cppflags)
+src_nl_neigh_delete_LDADD =         $(src_ldadd)
+src_nl_neigh_list_CPPFLAGS =        $(src_cppflags)
+src_nl_neigh_list_LDADD =           $(src_ldadd)
+src_nl_neightbl_list_CPPFLAGS =     $(src_cppflags)
+src_nl_neightbl_list_LDADD =        $(src_ldadd)
+src_nl_pktloc_lookup_CPPFLAGS =     $(src_cppflags)
+src_nl_pktloc_lookup_LDADD =        $(src_ldadd)
+src_nl_qdisc_add_CPPFLAGS =         $(src_cppflags)
+src_nl_qdisc_add_LDADD =            $(src_ldadd)
+src_nl_qdisc_delete_CPPFLAGS =      $(src_cppflags)
+src_nl_qdisc_delete_LDADD =         $(src_ldadd)
+src_nl_qdisc_list_CPPFLAGS =        $(src_cppflags)
+src_nl_qdisc_list_LDADD =           $(src_ldadd)
+src_nl_route_add_CPPFLAGS =         $(src_cppflags)
+src_nl_route_add_LDADD =            $(src_ldadd)
+src_nl_route_delete_CPPFLAGS =      $(src_cppflags)
+src_nl_route_delete_LDADD =         $(src_ldadd)
+src_nl_route_get_CPPFLAGS =         $(src_cppflags)
+src_nl_route_get_LDADD =            $(src_ldadd)
+src_nl_route_list_CPPFLAGS =        $(src_cppflags)
+src_nl_route_list_LDADD =           $(src_ldadd)
+src_nl_rule_list_CPPFLAGS =         $(src_cppflags)
+src_nl_rule_list_LDADD =            $(src_ldadd)
+src_nl_tctree_list_CPPFLAGS =       $(src_cppflags)
+src_nl_tctree_list_LDADD =          $(src_ldadd)
+src_nl_util_addr_CPPFLAGS =         $(src_cppflags)
+src_nl_util_addr_LDADD =            $(src_ldadd)
+
+###############################################################################
+
 tests_cppflags = \
        -Wall \
        -D_GNU_SOURCE \

diff --git a/configure.ac b/configure.ac
index f3386decbd51419237726048e4f865925e1dbb20..a7f03b9e32796c15cc28a8622c8104d5a91a5344 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,6 @@ libnl-nf-3.0.pc
 libnl-cli-3.0.pc
 libnl-xfrm-3.0.pc
 libnl-idiag-3.0.pc
-src/Makefile
 python/setup.py
 include/netlink/version.h
 ])

diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644 (file)
index bf70217..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,140 +0,0 @@
-# -*- Makefile -*-
-
-AM_CPPFLAGS  = \
-       -I${top_srcdir}/include/linux-private \
-       -I${top_srcdir}/include \
-       -I${top_builddir}/include \
-       -D_GNU_SOURCE \
-       -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
-
-AM_CFLAGS = -Wall
-
-LDADD = \
-       ${top_builddir}/src/lib/libnl-cli-3.la \
-       ${top_builddir}/lib/libnl-3.la \
-       ${top_builddir}/lib/libnl-nf-3.la \
-       ${top_builddir}/lib/libnl-genl-3.la \
-       ${top_builddir}/lib/libnl-route-3.la \
-       ${top_builddir}/lib/libnl-idiag-3.la
-
-cli_programs = \
-       genl-ctrl-list \
-       idiag-socket-details \
-       nf-ct-add \
-       nf-ct-list \
-       nf-exp-add \
-       nf-exp-delete \
-       nf-exp-list \
-       nf-log \
-       nf-monitor \
-       nf-queue \
-       nl-addr-add \
-       nl-addr-delete \
-       nl-addr-list \
-       nl-class-add \
-       nl-class-delete \
-       nl-classid-lookup \
-       nl-class-list \
-       nl-cls-add \
-       nl-cls-delete \
-       nl-cls-list \
-       nl-fib-lookup \
-       nl-link-enslave \
-       nl-link-ifindex2name \
-       nl-link-list \
-       nl-link-name2ifindex \
-       nl-link-release \
-       nl-link-set \
-       nl-link-stats \
-       nl-list-caches \
-       nl-list-sockets \
-       nl-monitor \
-       nl-neigh-add \
-       nl-neigh-delete \
-       nl-neigh-list \
-       nl-neightbl-list \
-       nl-pktloc-lookup \
-       nl-qdisc-add \
-       nl-qdisc-delete \
-       nl-qdisc-list \
-       nl-route-add \
-       nl-route-delete \
-       nl-route-get \
-       nl-route-list \
-       nl-rule-list \
-       nl-tctree-list \
-       nl-util-addr
-
-if ENABLE_CLI_INSTALL_BIN
-bin_PROGRAMS = $(cli_programs)
-else
-if ENABLE_CLI_INSTALL_SBIN
-sbin_PROGRAMS = $(cli_programs)
-else
-noinst_PROGRAMS = $(cli_programs)
-endif
-endif
-
-genl_ctrl_list_SOURCES = genl-ctrl-list.c 
-
-nf_ct_list_SOURCES = nf-ct-list.c 
-nf_ct_add_SOURCES = nf-ct-add.c
-nf_log_SOURCES = nf-log.c
-nf_queue_SOURCES = nf-queue.c 
-nf_monitor_SOURCES = nf-monitor.c
-
-nf_exp_list_SOURCES = nf-exp-list.c 
-nf_exp_add_SOURCES = nf-exp-add.c 
-nf_exp_delete_SOURCES = nf-exp-delete.c 
-
-nl_addr_add_SOURCES = nl-addr-add.c
-nl_addr_delete_SOURCES = nl-addr-delete.c
-nl_addr_list_SOURCES = nl-addr-list.c
-
-nl_link_list_SOURCES = nl-link-list.c
-nl_link_set_SOURCES = nl-link-set.c
-nl_link_stats_SOURCES = nl-link-stats.c
-nl_link_ifindex2name_SOURCES = nl-link-ifindex2name.c
-nl_link_name2ifindex_SOURCES = nl-link-name2ifindex.c
-
-nl_monitor_SOURCES = nl-monitor.c
-
-nl_neigh_add_SOURCES = nl-neigh-add.c
-nl_neigh_delete_SOURCES = nl-neigh-delete.c
-nl_neigh_list_SOURCES = nl-neigh-list.c
-
-nl_neightbl_list_SOURCES = nl-neightbl-list.c
-
-nl_qdisc_add_SOURCES = nl-qdisc-add.c
-nl_qdisc_delete_SOURCES = nl-qdisc-delete.c
-nl_qdisc_list_SOURCES = nl-qdisc-list.c
-
-nl_class_add_SOURCES = nl-class-add.c
-nl_class_delete_SOURCES = nl-class-delete.c
-nl_class_list_SOURCES = nl-class-list.c
-
-nl_cls_add_SOURCES = nl-cls-add.c
-nl_cls_list_SOURCES = nl-cls-list.c
-nl_cls_delete_SOURCES = nl-cls-delete.c
-
-nl_route_add_SOURCES = nl-route-add.c
-nl_route_delete_SOURCES = nl-route-delete.c
-nl_route_get_SOURCES = nl-route-get.c
-nl_route_list_SOURCES = nl-route-list.c
-
-nl_rule_list_SOURCES = nl-rule-list.c
-
-nl_tctree_list_SOURCES = nl-tctree-list.c
-
-nl_fib_lookup_SOURCES = nl-fib-lookup.c
-
-nl_list_caches_SOURCES = nl-list-caches.c
-nl_list_sockets_SOURCES = nl-list-sockets.c
-
-nl_util_addr_SOURCES = nl-util-addr.c
-
-nl_pktloc_lookup_SOURCES = nl-pktloc-lookup.c
-
-nl_classid_lookup_SOURCES = nl-classid-lookup.c
-
-idiag_socket_details_SOURCES = idiag-socket-details.c