diff options
| author | David Lamparter <equinox@diac24.net> | 2020-06-19 01:07:58 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2020-06-19 01:07:58 +0200 |
| commit | 4b7272c7a68c93eda93bac6fccfd4e2ce37803fe (patch) | |
| tree | 956c5ec367647c4263d8338fb0789155b9701aba | |
| parent | Merge pull request #6602 from donaldsharp/allow_installation (diff) | |
| download | frr-4b7272c7a68c93eda93bac6fccfd4e2ce37803fe.tar.xz frr-4b7272c7a68c93eda93bac6fccfd4e2ce37803fe.zip | |
build: fix protobuf dependencies
Need to list #include'd header files in Makefile to make sure it builds
correctly.
Fixes: #6576
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
| -rw-r--r-- | zebra/subdir.am | 3 | ||||
| -rw-r--r-- | zebra/zebra_mlag.c | 4 | ||||
| -rw-r--r-- | zebra/zebra_mlag.h | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/zebra/subdir.am b/zebra/subdir.am index d98ef5257..49e60820b 100644 --- a/zebra/subdir.am +++ b/zebra/subdir.am @@ -44,6 +44,7 @@ endif zebra_zebra_LDADD = lib/libfrr.la $(LIBCAP) if HAVE_PROTOBUF3 zebra_zebra_LDADD += mlag/libmlag_pb.la $(PROTOBUF_C_LIBS) +zebra/zebra_mlag.$(OBJEXT): mlag/mlag.pb-c.h endif zebra_zebra_SOURCES = \ zebra/connected.c \ @@ -188,8 +189,10 @@ zebra_zebra_fpm_la_SOURCES += zebra/zebra_fpm_netlink.c if HAVE_PROTOBUF zebra_zebra_fpm_la_LIBADD += fpm/libfrrfpm_pb.la qpb/libfrr_pb.la $(PROTOBUF_C_LIBS) zebra_zebra_fpm_la_SOURCES += zebra/zebra_fpm_protobuf.c +zebra/zebra_fpm_protobuf.lo: fpm/fpm.pb-c.h qpb/qpb.pb-c.h if DEV_BUILD zebra_zebra_fpm_la_SOURCES += zebra/zebra_fpm_dt.c +zebra/zebra_fpm_dt.lo: fpm/fpm.pb-c.h qpb/qpb.pb-c.h endif endif diff --git a/zebra/zebra_mlag.c b/zebra/zebra_mlag.c index 8ba7998f5..3cf4ba8d3 100644 --- a/zebra/zebra_mlag.c +++ b/zebra/zebra_mlag.c @@ -33,6 +33,10 @@ #include "zebra/zapi_msg.h" #include "zebra/debug.h" +#ifdef HAVE_PROTOBUF_VERSION_3 +#include "mlag/mlag.pb-c.h" +#endif + DEFINE_HOOK(zebra_mlag_private_write_data, (uint8_t *data, uint32_t len), (data, len)) DEFINE_HOOK(zebra_mlag_private_monitor_state, (), ()) diff --git a/zebra/zebra_mlag.h b/zebra/zebra_mlag.h index 66f5c4c67..d10a1f915 100644 --- a/zebra/zebra_mlag.h +++ b/zebra/zebra_mlag.h @@ -26,10 +26,6 @@ #include "zclient.h" #include "zebra/zserv.h" -#ifdef HAVE_PROTOBUF_VERSION_3 -#include "mlag/mlag.pb-c.h" -#endif - #ifdef __cplusplus extern "C" { #endif |