matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ospfd, ospfclient: Do not just include .c files in another .c

Browse source 
ospfclient.c includes .c files directly from ospfd.  Let's separate
these out a bit.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-12-05 11:55:14 -05:00
parent 29a1a53d6c
commit 253113bcb8
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ospfclient/ospf_apiclient.c
View file

@ -54,10 +54,6 @@
#include "ospf_apiclient.h" #include "ospf_apiclient.h"
/* *sigh* ... can't find a better way to hammer this into automake */
#include "ospfd/ospf_dump_api.c"
#include "ospfd/ospf_api.c"
XREF_SETUP(); XREF_SETUP();
DEFINE_MGROUP(OSPFCLIENT, "libospfapiclient"); DEFINE_MGROUP(OSPFCLIENT, "libospfapiclient");

1
ospfclient/subdir.am
View file

@ -27,6 +27,7 @@ endif
ospfclient_ospfclient_LDADD = \ ospfclient_ospfclient_LDADD = \
ospfclient/libfrrospfapiclient.la \ ospfclient/libfrrospfapiclient.la \
ospfd/libfrrospfclient.a \
$(LIBCAP) \ $(LIBCAP) \
# end # end

8
ospfd/subdir.am
View file

@ -4,6 +4,7 @@
if OSPFD if OSPFD
noinst_LIBRARIES += ospfd/libfrrospf.a noinst_LIBRARIES += ospfd/libfrrospf.a
noinst_LIBRARIES += ospfd/libfrrospfclient.a
sbin_PROGRAMS += ospfd/ospfd sbin_PROGRAMS += ospfd/ospfd
vtysh_daemons += ospfd vtysh_daemons += ospfd
if SNMP if SNMP
@ -12,6 +13,11 @@ endif
man8 += $(MANBUILD)/frr-ospfd.8 man8 += $(MANBUILD)/frr-ospfd.8
endif endif
ospfd_libfrrospfclient_a_SOURCES = \
ospfd/ospf_api.c \
ospfd/ospf_dump_api.c \
#end
ospfd_libfrrospf_a_SOURCES = \ ospfd_libfrrospf_a_SOURCES = \
ospfd/ospf_abr.c \ ospfd/ospf_abr.c \
ospfd/ospf_api.c \ ospfd/ospf_api.c \
@ -104,7 +110,7 @@ noinst_HEADERS += \
ospfd/ospf_zebra.h \ ospfd/ospf_zebra.h \
# end # end
ospfd_ospfd_LDADD = ospfd/libfrrospf.a lib/libfrr.la $(LIBCAP) $(LIBM) ospfd_ospfd_LDADD = ospfd/libfrrospf.a ospfd/libfrrospfclient.a lib/libfrr.la $(LIBCAP) $(LIBM)
ospfd_ospfd_SOURCES = ospfd/ospf_main.c ospfd_ospfd_SOURCES = ospfd/ospf_main.c
ospfd_ospfd_snmp_la_SOURCES = ospfd/ospf_snmp.c ospfd_ospfd_snmp_la_SOURCES = ospfd/ospf_snmp.c