diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-12-05 11:55:14 -0500 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-03-20 08:33:36 +0000 |
| commit | 5d7402780ebbd43e0ddb51aed8fb3a7232775ed7 (patch) | |
| tree | 8b7f127a0f47913cd54113f62b614a254d8521b3 | |
| parent | 73850c562f7644cc3df339607f0a592940c64d2c (diff) | |
ospfd, ospfclient: Do not just include .c files in another .c
ospfclient.c includes .c files directly from ospfd. Let's separate
these out a bit.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 253113bcb80b7b489eb848988a90459403f870de)
| -rw-r--r-- | ospfclient/ospf_apiclient.c | 4 | ||||
| -rw-r--r-- | ospfclient/subdir.am | 1 | ||||
| -rw-r--r-- | ospfd/subdir.am | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c index 4ce65e379a..2a125f08db 100644 --- a/ospfclient/ospf_apiclient.c +++ b/ospfclient/ospf_apiclient.c @@ -54,10 +54,6 @@ #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(); DEFINE_MGROUP(OSPFCLIENT, "libospfapiclient"); diff --git a/ospfclient/subdir.am b/ospfclient/subdir.am index b8c82c0bcf..289ddd009d 100644 --- a/ospfclient/subdir.am +++ b/ospfclient/subdir.am @@ -27,6 +27,7 @@ endif ospfclient_ospfclient_LDADD = \ ospfclient/libfrrospfapiclient.la \ + ospfd/libfrrospfclient.a \ $(LIBCAP) \ # end diff --git a/ospfd/subdir.am b/ospfd/subdir.am index 4f9cbc7b1e..b03a61915f 100644 --- a/ospfd/subdir.am +++ b/ospfd/subdir.am @@ -4,6 +4,7 @@ if OSPFD noinst_LIBRARIES += ospfd/libfrrospf.a +noinst_LIBRARIES += ospfd/libfrrospfclient.a sbin_PROGRAMS += ospfd/ospfd vtysh_scan += \ ospfd/ospf_bfd.c \ @@ -24,6 +25,11 @@ endif man8 += $(MANBUILD)/frr-ospfd.8 endif +ospfd_libfrrospfclient_a_SOURCES = \ + ospfd/ospf_api.c \ + ospfd/ospf_dump_api.c \ + #end + ospfd_libfrrospf_a_SOURCES = \ ospfd/ospf_abr.c \ ospfd/ospf_api.c \ @@ -114,7 +120,7 @@ noinst_HEADERS += \ ospfd/ospf_zebra.h \ # 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_snmp_la_SOURCES = ospfd/ospf_snmp.c |