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)

diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c
index 4ce65e379aae8b8d69bae43ea18d932b6c8b6a59..2a125f08db83459609489f29aefd222687ddd73c 100644 (file)
--- 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 b8c82c0bcfcf6599c2227224cfc7200d29fdb66c..289ddd009d0f8bbd5b6ab3bdc27d996f37460d8a 100644 (file)
--- 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 4f9cbc7b1ee691c3efa2c323065bb3ed3e674cf4..b03a61915f20bad4dcea79c0b809658c9b2235d8 100644 (file)
--- 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