diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-09 12:13:49 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-09 12:13:49 -0500 |
| commit | 8df6a2a80aba86bf0deb0a35472cbb95b5eaa82b (patch) | |
| tree | 9707c2a473bd20c3153ce2f1be6b14e27de8fde3 | |
| parent | 305e9740fff1be7e8b66d0ba6fdbaece35a18524 (diff) | |
| parent | 3cf5e246241055ddb8ab3842160b5abc8d53c4f1 (diff) | |
Merge remote-tracking branch 'origin/stable/2.0'
| -rw-r--r-- | ospfclient/Makefile.am | 2 | ||||
| -rw-r--r-- | ospfclient/ospf_apiclient.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am index 28dc65d165..b4e362bbb3 100644 --- a/ospfclient/Makefile.am +++ b/ospfclient/Makefile.am @@ -11,7 +11,7 @@ libfrrospfapiclient_la_LIBADD = ../lib/libfrr.la sbin_PROGRAMS = ospfclient libfrrospfapiclient_la_SOURCES = \ - ospf_apiclient.c ../ospfd/ospf_dump_api.c ../ospfd/ospf_api.c + ospf_apiclient.c ospfapiheaderdir = $(pkgincludedir)/ospfapi diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c index 1590b65384..fd53ab364c 100644 --- a/ospfclient/ospf_apiclient.c +++ b/ospfclient/ospf_apiclient.c @@ -49,6 +49,10 @@ #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_MTYPE_STATIC(OSPFCLIENT, OSPF_APICLIENT, "OSPF-API client") |