From f642358837b015dbc8485042679c4f587e02ee7b Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 11 Nov 2021 15:46:54 +0100 Subject: [PATCH] build: fix duplicate yang.c file inclusions Signed-off-by: David Lamparter --- lib/subdir.am | 1 - pimd/subdir.am | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/subdir.am b/lib/subdir.am index 52eeda81ce..bb10d71ed1 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -130,7 +130,6 @@ nodist_lib_libfrr_la_SOURCES = \ yang/ietf/ietf-interfaces.yang.c \ yang/ietf/ietf-bgp-types.yang.c \ yang/frr-module-translator.yang.c \ - yang/frr-nexthop.yang.c \ # end vtysh_scan += \ diff --git a/pimd/subdir.am b/pimd/subdir.am index 8c9f687a50..f8bc0ff081 100644 --- a/pimd/subdir.am +++ b/pimd/subdir.am @@ -66,6 +66,9 @@ pimd_pimd_SOURCES = \ pimd/pim_vxlan.c \ pimd/pim_zpthread.c \ pimd/pimd.c \ + # end + +nodist_pimd_pimd_SOURCES = \ yang/frr-pim.yang.c \ yang/frr-pim-rp.yang.c \ yang/frr-igmp.yang.c \ @@ -131,12 +134,6 @@ 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 = lib/libfrr.la $(LIBCAP) pimd_test_igmpv3_join_LDADD = lib/libfrr.la