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 /ripd | |
| 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 'ripd')
| -rw-r--r-- | ripd/subdir.am | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ripd/subdir.am b/ripd/subdir.am index b43e369ab..b00c37588 100644 --- 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 |