diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-09-17 19:07:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 19:07:39 -0400 |
| commit | d487c49127bd16df24c313ff0af3bfa1852af1ad (patch) | |
| tree | 4e6b725feffd1a48c56e7bbdcf9bcfdaed02346a | |
| parent | ef5307f23fbde3282f17a25f0201a4c75de5fd42 (diff) | |
| parent | 2d50cb8062d388191cb7a6803af991f9d46f4565 (diff) | |
Merge pull request #4996 from opensourcerouting/build-tags
build: fix "make tags"
| -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 a0fa3d274f..a645ca2b03 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 3fb163fccf..048e12a024 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 75a733f8fc..1864ba7369 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 \ |