diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2021-11-13 16:10:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 16:10:59 +0100 |
| commit | 045e0235499c0caf4ba2d98fd1f2c595972dc587 (patch) | |
| tree | 5550c3ceabd286a430e690c5c28ba7d406aff948 /eigrpd | |
| parent | Merge pull request #10036 from donaldsharp/finally_frr (diff) | |
| parent | build: fix duplicate yang.c file inclusions (diff) | |
| download | frr-045e0235499c0caf4ba2d98fd1f2c595972dc587.tar.xz frr-045e0235499c0caf4ba2d98fd1f2c595972dc587.zip | |
Merge pull request #10032 from opensourcerouting/build-fix-20211111
build: assorted build system improvements, 2021-11 edition
Diffstat (limited to 'eigrpd')
| -rw-r--r-- | eigrpd/subdir.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/eigrpd/subdir.am b/eigrpd/subdir.am index 82873a496..3b647e060 100644 --- 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) |