diff options
| author | David Lamparter <equinox@diac24.net> | 2019-09-17 16:32:26 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-09-17 16:35:12 +0200 |
| commit | 2d50cb8062d388191cb7a6803af991f9d46f4565 (patch) | |
| tree | 337c5624ed708b034dae412c377060a7100d7a61 | |
| parent | Merge pull request #4993 from ton31337/fix/remove_trailing_whitespaces (diff) | |
| download | frr-2d50cb8062d388191cb7a6803af991f9d46f4565.tar.xz frr-2d50cb8062d388191cb7a6803af991f9d46f4565.zip | |
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>
| -rw-r--r-- | fpm/subdir.am | 4 | ||||
| -rw-r--r-- | grpc/subdir.am | 2 | ||||
| -rw-r--r-- | qpb/subdir.am | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/fpm/subdir.am b/fpm/subdir.am index a0fa3d274..a645ca2b0 100644 --- 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 3fb163fcc..048e12a02 100644 --- 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 75a733f8f..1864ba736 100644 --- 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 \ |