Merge remote-tracking branch 'origin/stable/2.0'

This commit is contained in:
Donald Sharp 2017-02-09 12:13:49 -05:00
commit 8df6a2a80a
2 changed files with 5 additions and 1 deletions

View File

@ -11,7 +11,7 @@ libfrrospfapiclient_la_LIBADD = ../lib/libfrr.la
sbin_PROGRAMS = ospfclient sbin_PROGRAMS = ospfclient
libfrrospfapiclient_la_SOURCES = \ libfrrospfapiclient_la_SOURCES = \
ospf_apiclient.c ../ospfd/ospf_dump_api.c ../ospfd/ospf_api.c ospf_apiclient.c
ospfapiheaderdir = $(pkgincludedir)/ospfapi ospfapiheaderdir = $(pkgincludedir)/ospfapi

View File

@ -49,6 +49,10 @@
#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"
DEFINE_MGROUP(OSPFCLIENT, "libospfapiclient") DEFINE_MGROUP(OSPFCLIENT, "libospfapiclient")
DEFINE_MTYPE_STATIC(OSPFCLIENT, OSPF_APICLIENT, "OSPF-API client") DEFINE_MTYPE_STATIC(OSPFCLIENT, OSPF_APICLIENT, "OSPF-API client")