diff options
| author | Chirag Shah <chirag@cumulusnetworks.com> | 2020-07-22 23:16:05 -0700 |
|---|---|---|
| committer | Chirag Shah <chirag@cumulusnetworks.com> | 2020-07-22 23:22:23 -0700 |
| commit | b37e4b282dc1cf18d7775ca86ecc9774cd04535e (patch) | |
| tree | cf70758b26f17a57efa11eaf60fc472f18cd3c6c | |
| parent | 9d9adc84c71183cb3837f89cbe3f0c82aabd09f2 (diff) | |
*: pim igmp yang registery to appropriate makefile
Move pim and igmp yang files registery to appropriate makefiles.
In yang directory makefile move under `PIMD`
Remove pimd yang files from library makefile instead move them
to pimd makefile.
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
| -rw-r--r-- | lib/subdir.am | 3 | ||||
| -rw-r--r-- | pimd/subdir.am | 6 | ||||
| -rw-r--r-- | yang/subdir.am | 9 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lib/subdir.am b/lib/subdir.am index f185841c76..34ad30f968 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -124,9 +124,6 @@ nodist_lib_libfrr_la_SOURCES = \ yang/ietf/ietf-interfaces.yang.c \ yang/frr-module-translator.yang.c \ yang/frr-nexthop.yang.c \ - yang/frr-igmp.yang.c \ - yang/frr-pim.yang.c \ - yang/frr-pim-rp.yang.c \ # end vtysh_scan += \ diff --git a/pimd/subdir.am b/pimd/subdir.am index 121abea598..8540651544 100644 --- a/pimd/subdir.am +++ b/pimd/subdir.am @@ -127,6 +127,12 @@ clippy_scan += \ pimd/pim_cmd.c \ # end +nodist_pimd_pimd_SOURCES = \ + yang/frr-igmp.yang.c \ + yang/frr-pim.yang.c \ + yang/frr-pim-rp.yang.c \ + # end + pimd_pimd_LDADD = pimd/libpim.a lib/libfrr.la $(LIBCAP) pimd_pimd_SOURCES = pimd/pim_main.c diff --git a/yang/subdir.am b/yang/subdir.am index 6caf9fc5f3..6aae0e4701 100644 --- a/yang/subdir.am +++ b/yang/subdir.am @@ -29,10 +29,7 @@ dist_yangmodels_DATA += yang/frr-vrf.yang dist_yangmodels_DATA += yang/frr-route-types.yang dist_yangmodels_DATA += yang/frr-routing.yang dist_yangmodels_DATA += yang/ietf/ietf-routing-types.yang -dist_yangmodels_DATA += yang/frr-igmp.yang dist_yangmodels_DATA += yang/ietf/ietf-interfaces.yang -dist_yangmodels_DATA += yang/frr-pim.yang -dist_yangmodels_DATA += yang/frr-pim-rp.yang if BFDD dist_yangmodels_DATA += yang/frr-bfdd.yang @@ -65,3 +62,9 @@ endif if ZEBRA dist_yangmodels_DATA += yang/frr-zebra.yang endif + +if PIMD +dist_yangmodels_DATA += yang/frr-igmp.yang +dist_yangmodels_DATA += yang/frr-pim.yang +dist_yangmodels_DATA += yang/frr-pim-rp.yang +endif |