Protobuf: Update library name to reflect name change to FRR

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/common.am b/common.am
index ac7a3230daacc1af54290adc118310b05cf576dc..c6da3d75e8fc9425dc6a8df8bf10f1ca2a744bb7 100644 (file)
--- 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 0fbda61f3ccdfd1e195dff29dfda53a769c4f337..e5951b2be93e9a7297dedaf5a3dc8a88ea98e263 100644 (file)
--- 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 99ccd05511048de6bf2bf60208345e238281e40a..7a09452c6f0c78eeea123b9dc2c8c35a735dc119 100644 (file)
--- 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 8323d3ed73e01c4d248949ebb50dbc2ca527c02f..a1595a9abd1b65f26337943f519bb3dc52e1710d 100644 (file)
--- 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 83ddf56cbc926b36ee8823eb52c0e4182d66d335..bb7dcf38f3fceced8b555159107f426e8d730b60 100644 (file)
--- 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_