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