*: Convert libospf -> libfrrospf

Convert the libospfapiclient -> libfrrospfapiclient
and libospf -> libfrrospf to prevent namespace
collision with Quagga.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

5 files changed, 24 insertions, 24 deletions

diff --git a/debian/frr.lintian-overrides b/debian/frr.lintian-overrides
index 027fc2a1d..01c623eb2 100644
--- a/debian/frr.lintian-overrides
+++ b/debian/frr.lintian-overrides
@@ -1,4 +1,4 @@
-frr: non-dev-pkg-with-shlib-symlink usr/lib/libospfapiclient.so.0.0.0 usr/lib/libospfapiclient.so
-frr: non-dev-pkg-with-shlib-symlink usr/lib/libospf.so.0.0.0 usr/lib/libospf.so
+frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrrospfapiclient.so.0.0.0 usr/lib/libfrrospfapiclient.so
+frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrrospf.so.0.0.0 usr/lib/libfrrospf.so
 frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrr.so.0.0.0 usr/lib/libfrr.so
-frr: package-name-doesnt-match-sonames libospf0 libospfapiclient0 libfrr0
+frr: package-name-doesnt-match-sonames libfrrospf0 libfrrospfapiclient0 libfrr0
diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am
index 003918ffc..482de287d 100644
--- a/ospfclient/Makefile.am
+++ b/ospfclient/Makefile.am
@@ -3,13 +3,13 @@
 AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
 AM_CFLAGS = $(WERROR)
 
-lib_LTLIBRARIES = libospfapiclient.la
-libospfapiclient_la_LDFLAGS = -version-info 0:0:0
-libospfapiclient_la_LIBADD = ../ospfd/libospf.la ../lib/libfrr.la
+lib_LTLIBRARIES = libfrrospfapiclient.la
+libfrrospfapiclient_la_LDFLAGS = -version-info 0:0:0
+libfrrospfapiclient_la_LIBADD = ../ospfd/libfrrospf.la ../lib/libfrr.la
 
 sbin_PROGRAMS = ospfclient
 
-libospfapiclient_la_SOURCES = \
+libfrrospfapiclient_la_SOURCES = \
 	ospf_apiclient.c
 
 ospfapiheaderdir = $(pkgincludedir)/ospfapi
@@ -20,8 +20,8 @@ ospfapiheader_HEADERS = \
 ospfclient_SOURCES = \
 	ospfclient.c
 
-ospfclient_LDADD = libospfapiclient.la \
-	../ospfd/libospf.la ../lib/libfrr.la @LIBCAP@
+ospfclient_LDADD = libfrrospfapiclient.la \
+	../ospfd/libfrrospf.la ../lib/libfrr.la @LIBCAP@
 
 ospfclient_CFLAGS = $(AM_CFLAGS)
 ospfclient_LDFLAGS = $(AM_LDFLAGS)
diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index 23c69b6f8..14b01551b 100644
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -5,13 +5,13 @@ AM_CFLAGS = $(WERROR)
 DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA=@INSTALL@ -m 600
 
-lib_LTLIBRARIES = libospf.la
-libospf_la_LDFLAGS = -version-info 0:0:0
-libospf_la_LIBADD = ../lib/libfrr.la
+lib_LTLIBRARIES = libfrrospf.la
+libfrrospf_la_LDFLAGS = -version-info 0:0:0
+libfrrospf_la_LIBADD = ../lib/libfrr.la
 
 sbin_PROGRAMS = ospfd
 
-libospf_la_SOURCES = \
+libfrrospf_la_SOURCES = \
 	ospfd.c ospf_zebra.c ospf_interface.c ospf_ism.c ospf_neighbor.c \
 	ospf_nsm.c ospf_dump.c ospf_network.c ospf_packet.c ospf_lsa.c \
 	ospf_spf.c ospf_route.c ospf_ase.c ospf_abr.c ospf_ia.c ospf_flood.c \
@@ -33,7 +33,7 @@ noinst_HEADERS = \
 
 ospfd_SOURCES = ospf_main.c
 
-ospfd_LDADD = libospf.la ../lib/libfrr.la @LIBCAP@ @LIBM@
+ospfd_LDADD = libfrrospf.la ../lib/libfrr.la @LIBCAP@ @LIBM@
 
 EXTRA_DIST = OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt
 
diff --git a/solaris/prototype.dev.in b/solaris/prototype.dev.in
index 8bc3b3156..f40fbdcd5 100644
--- a/solaris/prototype.dev.in
+++ b/solaris/prototype.dev.in
@@ -3,10 +3,10 @@ i depend=$abs_builddir/depend.dev
 i copying=$abs_top_srcdir/COPYING
 f none @libdir@/libfrr.la=$DESTDIR/@libdir@/libfrr.la 0755 root bin
 f none @libdir@/libfrr.a=$DESTDIR/@libdir@/libfrr.a 0644 root bin
-f none @libdir@/libospf.la=$DESTDIR/@libdir@/libospf.la 0755 root bin
-f none @libdir@/libospf.a=$DESTDIR/@libdir@/libospf.a 0644 root bin
-f none @libdir@/libospfapiclient.la=$DESTDIR/@libdir@/libospfapiclient.la 0755 root bin
-f none @libdir@/libospfapiclient.a=$DESTDIR/@libdir@/libospfapiclient.a 0644 root bin
+f none @libdir@/libfrrospf.la=$DESTDIR/@libdir@/libfrrospf.la 0755 root bin
+f none @libdir@/libfrrospf.a=$DESTDIR/@libdir@/libfrrospf.a 0644 root bin
+f none @libdir@/libfrrospfapiclient.la=$DESTDIR/@libdir@/libfrrospfapiclient.la 0755 root bin
+f none @libdir@/libfrrospfapiclient.a=$DESTDIR/@libdir@/libfrrospfapiclient.a 0644 root bin
 d none @includedir@=$DESTDIR/@includedir@ 0755 root bin
 d none @includedir@/frr=$DESTDIR/@includedir@/frr 0755 root bin
 d none @includedir@/frr/ospfd=$DESTDIR/@includedir@/frr/ospfd 0755 root bin
diff --git a/solaris/prototype.libs.in b/solaris/prototype.libs.in
index 20aba05e4..07fe333ba 100644
--- a/solaris/prototype.libs.in
+++ b/solaris/prototype.libs.in
@@ -5,9 +5,9 @@ d none @libdir@=$DESTDIR/@libdir@ 0755 root bin
 s none @libdir@/libfrr.so.0=libfrr.so.0.0.0
 f none @libdir@/libfrr.so.0.0.0=$DESTDIR/@libdir@/libfrr.so.0.0.0 0755 root bin
 s none @libdir@/libfrr.so=libfrr.so.0.0.0
-s none @libdir@/libospf.so.0=libospf.so.0.0.0
-f none @libdir@/libospf.so.0.0.0=$DESTDIR/@libdir@/libospf.so.0.0.0 0755 root bin
-s none @libdir@/libospf.so=libospf.so.0.0.0
-f none @libdir@/libospfapiclient.so.0.0.0=$DESTDIR/@libdir@/libospfapiclient.so.0.0.0 0755 root bin
-s none @libdir@/libospfapiclient.so.0=libospfapiclient.so.0.0.0
-s none @libdir@/libospfapiclient.so=libospfapiclient.so.0.0.0
+s none @libdir@/libfrrospf.so.0=libfrrospf.so.0.0.0
+f none @libdir@/libfrrospf.so.0.0.0=$DESTDIR/@libdir@/libfrrospf.so.0.0.0 0755 root bin
+s none @libdir@/libfrrospf.so=libfrrospf.so.0.0.0
+f none @libdir@/libfrrospfapiclient.so.0.0.0=$DESTDIR/@libdir@/libfrrospfapiclient.so.0.0.0 0755 root bin
+s none @libdir@/libfrrospfapiclient.so.0=libfrrospfapiclient.so.0.0.0
+s none @libdir@/libfrrospfapiclient.so=libfrrospfapiclient.so.0.0.0