build: fix "make tags"

Anything we list in a xxx_SOURCES variable will be included for "make
tags", including filess marked as nodist_xxx_SOURCES.  So if we don't
have Protobuf enabled, even though the entire library isn't built, "make
tags" will still try to process these files... which we can't
autogenerate because Protobuf is disabled.  Same for gRPC.

Fixes: #3266
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/fpm/subdir.am b/fpm/subdir.am
index a0fa3d274f27436b28bcd86c50e71924140d0692..a645ca2b035f852e07548f85a5718d0e4f58eacf 100644 (file)
--- a/fpm/subdir.am
+++ b/fpm/subdir.am
@@ -12,9 +12,13 @@ fpm_libfrrfpm_pb_la_SOURCES = \
        fpm/fpm_pb.c \
        # end
 
+if FPM
+if HAVE_PROTOBUF
 nodist_fpm_libfrrfpm_pb_la_SOURCES = \
        fpm/fpm.pb-c.c \
        # end
+endif
+endif
 
 CLEANFILES += \
        fpm/fpm.pb-c.c \

diff --git a/grpc/subdir.am b/grpc/subdir.am
index 3fb163fccff2b8dfbc76e512db57b9d41a841a01..048e12a024381c751a319033e48fc0b850c0f3c9 100644 (file)
--- a/grpc/subdir.am
+++ b/grpc/subdir.am
@@ -5,10 +5,12 @@ endif
 grpc_libfrrgrpc_pb_la_LDFLAGS = -version-info 0:0:0
 grpc_libfrrgrpc_pb_la_CPPFLAGS = $(AM_CPPFLAGS) $(GRPC_CXXFLAGS)
 
+if GRPC
 nodist_grpc_libfrrgrpc_pb_la_SOURCES = \
        grpc/frr-northbound.pb.cc \
        grpc/frr-northbound.grpc.pb.cc \
        # end
+endif
 
 CLEANFILES += \
        grpc/frr-northbound.pb.cc \

diff --git a/qpb/subdir.am b/qpb/subdir.am
index 75a733f8fcfeba54682d169d492814cac42cf40c..1864ba7369d411fbf375bfa4445d7a2cfd373ba2 100644 (file)
--- a/qpb/subdir.am
+++ b/qpb/subdir.am
@@ -10,9 +10,12 @@ qpb_libfrr_pb_la_SOURCES = \
        qpb/qpb.c \
        qpb/qpb_allocator.c \
        # end
+
+if HAVE_PROTOBUF
 nodist_qpb_libfrr_pb_la_SOURCES = \
        qpb/qpb.pb-c.c \
        # end
+endif
 
 noinst_HEADERS += \
        qpb/linear_allocator.h \