From fc5300bdbc9dba3221ad8f1e3d1beeb99a94bed6 Mon Sep 17 00:00:00 2001
From: Martin Winter <mwinter@opensourcerouting.org>
Date: Fri, 20 Jan 2017 02:58:55 +0700
Subject: [PATCH] Protobuf: Update library name to reflect name change to FRR

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
---
 common.am           | 4 ++--
 qpb/Makefile.am     | 8 ++++----
 qpb/README.txt      | 2 +-
 qpb/qpb.proto       | 2 +-
 qpb/qpb_allocator.h | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common.am b/common.am
index ac7a3230da..c6da3d75e8 100644
--- a/common.am
+++ b/common.am
@@ -30,9 +30,9 @@ Q_PROTOBUF_SRCS = $(Q_PROTOBUF_CFILES) $(Q_PROTOBUF_HFILES)
 #
 # Information about how to link to various libraries.
 #
-Q_QUAGGA_PB_CLIENT_LDOPTS = $(top_srcdir)/qpb/libquagga_pb.la $(Q_PROTOBUF_C_CLIENT_LDOPTS)
+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_QUAGGA_PB_CLIENT_LDOPTS)
+Q_FPM_PB_CLIENT_LDOPTS = $(top_srcdir)/fpm/libfpm_pb.la $(Q_FRR_PB_CLIENT_LDOPTS)
 
 endif  # HAVE_PROTOBUF
 
diff --git a/qpb/Makefile.am b/qpb/Makefile.am
index 0fbda61f3c..e5951b2be9 100644
--- a/qpb/Makefile.am
+++ b/qpb/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 = qpb
 
-lib_LTLIBRARIES = libquagga_pb.la
-libquagga_pb_la_LDFLAGS = -version-info 0:0:0
+lib_LTLIBRARIES = libfrr_pb.la
+libfrr_pb_la_LDFLAGS = -version-info 0:0:0
 
 if HAVE_PROTOBUF
 protobuf_srcs =					\
@@ -16,14 +16,14 @@ protobuf_srcs_nodist =				\
 	qpb.pb-c.c
 endif
 
-libquagga_pb_la_SOURCES =			\
+libfrr_pb_la_SOURCES =			\
 	linear_allocator.h			\
 	qpb.h					\
 	qpb.c					\
 	qpb_allocator.h				\
 	$(protobuf_srcs)
 
-nodist_libquagga_pb_la_SOURCES = $(protobuf_srcs_nodist)
+nodist_libfrr_pb_la_SOURCES = $(protobuf_srcs_nodist)
 
 CLEANFILES = $(Q_CLEANFILES)
 BUILT_SOURCES = $(Q_PROTOBUF_SRCS)
diff --git a/qpb/README.txt b/qpb/README.txt
index 99ccd05511..7a09452c6f 100644
--- a/qpb/README.txt
+++ b/qpb/README.txt
@@ -1 +1 @@
-Protobuf definitions and code that is applicable to all of quagga.
+Protobuf definitions and code that is applicable to all of Quagga/FRR.
diff --git a/qpb/qpb.proto b/qpb/qpb.proto
index 8323d3ed73..a1595a9abd 100644
--- a/qpb/qpb.proto
+++ b/qpb/qpb.proto
@@ -21,7 +21,7 @@
  */
 
 /*
- * Protobuf definitions pertaining to the Quagga Protobuf component.
+ * Protobuf definitions pertaining to the Quagga/FRR Protobuf component.
  */
 package qpb;
 
diff --git a/qpb/qpb_allocator.h b/qpb/qpb_allocator.h
index 83ddf56cbc..bb7dcf38f3 100644
--- a/qpb/qpb_allocator.h
+++ b/qpb/qpb_allocator.h
@@ -24,7 +24,7 @@
  */
 
 /*
- * Header file for quagga protobuf memory management code.
+ * Header file for Quagga/FRR protobuf memory management code.
  */
 
 #ifndef _QPB_ALLOCATOR_H_
-- 
2.39.5