build: remove some useless intermediate libraries

These really serve no purpose other than slowing our build down.  If
there's a benefit to any of these, they can be readded.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/babeld/subdir.am b/babeld/subdir.am
index c9b6959fcaf0fe00c9941914da01ac47db07ddbe..856cbd13e397582b2e3435c8b64fef652a9c5ac6 100644 (file)
--- a/babeld/subdir.am
+++ b/babeld/subdir.am
@@ -3,7 +3,6 @@
 #
 
 if BABELD
-noinst_LIBRARIES += babeld/libbabel.a
 sbin_PROGRAMS += babeld/babeld
 vtysh_scan += \
        babeld/babel_interface.c \
@@ -13,10 +12,11 @@ vtysh_scan += \
 vtysh_daemons += babeld
 endif
 
-babeld_libbabel_a_SOURCES = \
+babeld_babeld_SOURCES = \
        babeld/babel_errors.c \
        babeld/babel_filter.c \
        babeld/babel_interface.c \
+       babeld/babel_main.c \
        babeld/babel_zebra.c \
        babeld/babeld.c \
        babeld/kernel.c \
@@ -48,5 +48,4 @@ noinst_HEADERS += \
        babeld/xroute.h \
        # end
 
-babeld_babeld_SOURCES = babeld/babel_main.c
-babeld_babeld_LDADD = babeld/libbabel.a lib/libfrr.la $(LIBCAP)
+babeld_babeld_LDADD = lib/libfrr.la $(LIBCAP)

diff --git a/eigrpd/subdir.am b/eigrpd/subdir.am
index 82873a4960c1793f52ad318268eb2881a84c42f9..3b647e060b842a9731df6bb41b196c89a6752f2b 100644 (file)
--- a/eigrpd/subdir.am
+++ b/eigrpd/subdir.am
@@ -3,7 +3,6 @@
 #
 
 if EIGRPD
-noinst_LIBRARIES += eigrpd/libeigrp.a
 sbin_PROGRAMS += eigrpd/eigrpd
 vtysh_scan += \
        eigrpd/eigrp_cli.c \
@@ -15,7 +14,7 @@ vtysh_daemons += eigrpd
 man8 += $(MANBUILD)/frr-eigrpd.8
 endif
 
-eigrpd_libeigrp_a_SOURCES = \
+eigrpd_eigrpd_SOURCES = \
        eigrpd/eigrp_cli.c \
        eigrpd/eigrp_dump.c \
        eigrpd/eigrp_errors.c \
@@ -23,6 +22,7 @@ eigrpd_libeigrp_a_SOURCES = \
        eigrpd/eigrp_fsm.c \
        eigrpd/eigrp_hello.c \
        eigrpd/eigrp_interface.c \
+       eigrpd/eigrp_main.c \
        eigrpd/eigrp_metric.c \
        eigrpd/eigrp_neighbor.c \
        eigrpd/eigrp_network.c \
@@ -78,5 +78,4 @@ nodist_eigrpd_eigrpd_SOURCES = \
        yang/frr-eigrpd.yang.c \
        # end
 
-eigrpd_eigrpd_SOURCES = eigrpd/eigrp_main.c
-eigrpd_eigrpd_LDADD = eigrpd/libeigrp.a lib/libfrr.la $(LIBCAP)
+eigrpd_eigrpd_LDADD = lib/libfrr.la $(LIBCAP)

diff --git a/pimd/subdir.am b/pimd/subdir.am
index 9910642ffa40a97c8eecbf23a5d6854b9a4c0f23..8c9f687a502f9fb30c9669991209c0689fb409dd 100644 (file)
--- a/pimd/subdir.am
+++ b/pimd/subdir.am
@@ -3,7 +3,6 @@
 #
 
 if PIMD
-noinst_LIBRARIES += pimd/libpim.a
 sbin_PROGRAMS += pimd/pimd
 bin_PROGRAMS += pimd/mtracebis
 noinst_PROGRAMS += pimd/test_igmpv3_join
@@ -13,7 +12,7 @@ man8 += $(MANBUILD)/frr-pimd.8
 man8 += $(MANBUILD)/mtracebis.8
 endif
 
-pimd_libpim_a_SOURCES = \
+pimd_pimd_SOURCES = \
        pimd/pim_assert.c \
        pimd/pim_bfd.c \
        pimd/pim_br.c \
@@ -33,6 +32,7 @@ pimd_libpim_a_SOURCES = \
        pimd/pim_join.c \
        pimd/pim_jp_agg.c \
        pimd/pim_macro.c \
+       pimd/pim_main.c \
        pimd/pim_memory.c \
        pimd/pim_mlag.c \
        pimd/pim_mroute.c \
@@ -137,8 +137,7 @@ nodist_pimd_pimd_SOURCES = \
        yang/frr-pim-rp.yang.c \
        # end
 
-pimd_pimd_LDADD = pimd/libpim.a lib/libfrr.la $(LIBCAP)
-pimd_pimd_SOURCES = pimd/pim_main.c
+pimd_pimd_LDADD = lib/libfrr.la $(LIBCAP)
 
 pimd_test_igmpv3_join_LDADD = lib/libfrr.la
 pimd_test_igmpv3_join_SOURCES = pimd/test_igmpv3_join.c

diff --git a/ripd/subdir.am b/ripd/subdir.am
index b43e369ab28fba63fea1d481d61fcedd74f8ac72..b00c375888fb798a2bbfb8a1c495686727c9e25a 100644 (file)
--- a/ripd/subdir.am
+++ b/ripd/subdir.am
@@ -3,7 +3,6 @@
 #
 
 if RIPD
-noinst_LIBRARIES += ripd/librip.a
 sbin_PROGRAMS += ripd/ripd
 vtysh_scan += \
        ripd/rip_cli.c \
@@ -18,12 +17,13 @@ endif
 man8 += $(MANBUILD)/frr-ripd.8
 endif
 
-ripd_librip_a_SOURCES = \
+ripd_ripd_SOURCES = \
        ripd/rip_cli.c \
        ripd/rip_debug.c \
        ripd/rip_errors.c \
        ripd/rip_interface.c \
        ripd/rip_offset.c \
+       ripd/rip_main.c \
        ripd/rip_nb.c \
        ripd/rip_nb_config.c \
        ripd/rip_nb_rpcs.c \
@@ -47,10 +47,7 @@ noinst_HEADERS += \
        ripd/ripd.h \
        # end
 
-ripd_ripd_LDADD = ripd/librip.a lib/libfrr.la $(LIBCAP)
-ripd_ripd_SOURCES = \
-       ripd/rip_main.c \
-       # end
+ripd_ripd_LDADD = lib/libfrr.la $(LIBCAP)
 nodist_ripd_ripd_SOURCES = \
        yang/frr-ripd.yang.c \
        # end

diff --git a/ripngd/subdir.am b/ripngd/subdir.am
index 9d8d27d4ccbc890ea0c660828757ad3ed3781a03..a4db3e5a6b6c8bf57518f64020a378b21dd2dd89 100644 (file)
--- a/ripngd/subdir.am
+++ b/ripngd/subdir.am
@@ -3,7 +3,6 @@
 #
 
 if RIPNGD
-noinst_LIBRARIES += ripngd/libripng.a
 sbin_PROGRAMS += ripngd/ripngd
 vtysh_scan += \
        ripngd/ripng_cli.c \
@@ -14,12 +13,13 @@ vtysh_daemons += ripngd
 man8 += $(MANBUILD)/frr-ripngd.8
 endif
 
-ripngd_libripng_a_SOURCES = \
+ripngd_ripngd_SOURCES = \
        ripngd/ripng_cli.c \
        ripngd/ripng_debug.c \
        ripngd/ripng_interface.c \
        ripngd/ripng_nexthop.c \
        ripngd/ripng_offset.c \
+       ripngd/ripng_main.c \
        ripngd/ripng_nb.c \
        ripngd/ripng_nb_config.c \
        ripngd/ripng_nb_rpcs.c \
@@ -43,10 +43,7 @@ noinst_HEADERS += \
        ripngd/ripngd.h \
        # end
 
-ripngd_ripngd_LDADD = ripngd/libripng.a lib/libfrr.la $(LIBCAP)
-ripngd_ripngd_SOURCES = \
-       ripngd/ripng_main.c \
-       # end
+ripngd_ripngd_LDADD = lib/libfrr.la $(LIBCAP)
 nodist_ripngd_ripngd_SOURCES = \
        yang/frr-ripngd.yang.c \
        # end

diff --git a/vrrpd/subdir.am b/vrrpd/subdir.am
index dfa9b261c3ffd26f2a55e7d84367e55e5297f8c1..02e0497eef13869602e48b98003ad0de2535b261 100644 (file)
--- a/vrrpd/subdir.am
+++ b/vrrpd/subdir.am
@@ -3,17 +3,17 @@
 #
 
 if VRRPD
-noinst_LIBRARIES += vrrpd/libvrrp.a
 sbin_PROGRAMS += vrrpd/vrrpd
 vtysh_scan += vrrpd/vrrp_vty.c
 vtysh_daemons += vrrpd
 man8 += $(MANBUILD)/frr-vrrpd.8
 endif
 
-vrrpd_libvrrp_a_SOURCES = \
+vrrpd_vrrpd_SOURCES = \
        vrrpd/vrrp.c \
        vrrpd/vrrp_arp.c \
        vrrpd/vrrp_debug.c \
+       vrrpd/vrrp_main.c \
        vrrpd/vrrp_ndisc.c \
        vrrpd/vrrp_northbound.c \
        vrrpd/vrrp_packet.c \
@@ -35,8 +35,7 @@ clippy_scan += \
        vrrpd/vrrp_vty.c \
        # end
 
-vrrpd_vrrpd_SOURCES = vrrpd/vrrp_main.c
-vrrpd_vrrpd_LDADD = vrrpd/libvrrp.a lib/libfrr.la @LIBCAP@
+vrrpd_vrrpd_LDADD = lib/libfrr.la @LIBCAP@
 nodist_vrrpd_vrrpd_SOURCES = \
        yang/frr-vrrpd.yang.c \
        # end