Skip to content

Commit

Permalink
*: Convert libfpm -> libfrrfpm
Browse files Browse the repository at this point in the history
Convert the libfpm to libfrrfpm to prevent namespace
collision with Quagga.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
  • Loading branch information
donaldsharp committed Feb 3, 2017
1 parent 285a775 commit dfe1dee
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion common.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions fpm/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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)

Expand Down

0 comments on commit dfe1dee

Please sign in to comment.