From dfe1deea024131ced4d7d02931b10245b821a873 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 3 Feb 2017 08:43:09 -0500 Subject: [PATCH] *: Convert libfpm -> libfrrfpm Convert the libfpm to libfrrfpm to prevent namespace collision with Quagga. Signed-off-by: Donald Sharp --- common.am | 2 +- fpm/Makefile.am | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common.am b/common.am index c6da3d75e8fc..d01d673ae644 100644 --- a/common.am +++ b/common.am @@ -32,7 +32,7 @@ Q_PROTOBUF_SRCS = $(Q_PROTOBUF_CFILES) $(Q_PROTOBUF_HFILES) # Q_FRR_PB_CLIENT_LDOPTS = $(top_srcdir)/qpb/libfrr_pb.la $(Q_PROTOBUF_C_CLIENT_LDOPTS) -Q_FPM_PB_CLIENT_LDOPTS = $(top_srcdir)/fpm/libfpm_pb.la $(Q_FRR_PB_CLIENT_LDOPTS) +Q_FPM_PB_CLIENT_LDOPTS = $(top_srcdir)/fpm/libfrrfpm_pb.la $(Q_FRR_PB_CLIENT_LDOPTS) endif # HAVE_PROTOBUF diff --git a/fpm/Makefile.am b/fpm/Makefile.am index 83ab31ce3f65..1f46ac6db2b4 100644 --- a/fpm/Makefile.am +++ b/fpm/Makefile.am @@ -5,8 +5,8 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib $(Q PROTOBUF_INCLUDES=-I$(top_srcdir) PROTOBUF_PACKAGE = fpm -lib_LTLIBRARIES = libfpm_pb.la -libfpm_pb_la_LDFLAGS = -version-info 0:0:0 +lib_LTLIBRARIES = libfrrfpm_pb.la +libfrrfpm_pb_la_LDFLAGS = -version-info 0:0:0 if HAVE_PROTOBUF protobuf_srcs = @@ -15,13 +15,13 @@ protobuf_srcs_nodist = \ fpm.pb-c.c endif -libfpm_pb_la_SOURCES = \ +libfrrfpm_pb_la_SOURCES = \ fpm.h \ fpm_pb.h \ fpm_pb.c \ $(protobuf_srcs) -nodist_libfpm_pb_la_SOURCES = $(protobuf_srcs_nodist) +nodist_libfrrfpm_pb_la_SOURCES = $(protobuf_srcs_nodist) CLEANFILES = $(Q_CLEANFILES)