From 486295f10d972444b92f29a374e245e469661b82 Mon Sep 17 00:00:00 2001 From: smccroskey Date: Fri, 28 Jul 2017 17:25:30 -0700 Subject: [PATCH] pb libs: don't build if protobuf support is disabled Testing done: built and installed for all ubuntu targets These library targets should not be built if protobuf support is disabled, as that is their only functionality. Clears the following lintian warnings: W: frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrr_pb.so.0.0.0 usr/lib/libfrr_pb.so W: frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrrfpm_pb.so.0.0.0 usr/lib/libfrrfpm_pb.so W: frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrr_pb.so.0.0.0 W: frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrrfpm_pb.so.0.0.0 Signed-off-by: Silas McCroskey --- fpm/Makefile.am | 3 ++- qpb/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fpm/Makefile.am b/fpm/Makefile.am index 1f46ac6db2..d2ec850634 100644 --- a/fpm/Makefile.am +++ b/fpm/Makefile.am @@ -5,10 +5,11 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib $(Q PROTOBUF_INCLUDES=-I$(top_srcdir) PROTOBUF_PACKAGE = fpm +if HAVE_PROTOBUF + lib_LTLIBRARIES = libfrrfpm_pb.la libfrrfpm_pb_la_LDFLAGS = -version-info 0:0:0 -if HAVE_PROTOBUF protobuf_srcs = protobuf_srcs_nodist = \ diff --git a/qpb/Makefile.am b/qpb/Makefile.am index e5951b2be9..168db9fecd 100644 --- a/qpb/Makefile.am +++ b/qpb/Makefile.am @@ -5,10 +5,11 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib $(Q PROTOBUF_INCLUDES=-I$(top_srcdir) PROTOBUF_PACKAGE = qpb +if HAVE_PROTOBUF + lib_LTLIBRARIES = libfrr_pb.la libfrr_pb_la_LDFLAGS = -version-info 0:0:0 -if HAVE_PROTOBUF protobuf_srcs = \ qpb_allocator.c -- 2.39.5