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>

diff --git a/zebra/subdir.am b/zebra/subdir.am
index d98ef52571ec97d47aa7e78b03656994baa65908..49e60820bc05f911515fc03866714a771d2d5759 100644 (file)
--- 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 8ba7998f5091a5777fb5c5bb0024377e5e6c742e..3cf4ba8d393d599a6d1a403e5c58f37505e18a6d 100644 (file)
--- 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 66f5c4c67ec0c1c6654915abade816e0f7136ef9..d10a1f9157e218a44c074d2d4135b5c16c252ef9 100644 (file)
--- 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