From bd9db8f46efcf88be586caa99d83bbdabb371b66 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 9 Feb 2017 12:59:44 +0100 Subject: [PATCH] ospfclient: #include sources Pulling in source files from another directory breaks automake's distclean target, and there seems to be no good fix for this... (particularly since we need -fPIC build for a DSO here, while ospfd compiles for an executable...) Signed-off-by: David Lamparter --- ospfclient/Makefile.am | 2 +- ospfclient/ospf_apiclient.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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") -- 2.39.5