proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-25 16:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: Convert libospf -> libfrrospf

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

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-02-03 08:43:55 -05:00
parent dfe1deea02
commit 50b05f3c3d
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/frr.lintian-overrides vendored
View File

@ -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

12
ospfclient/Makefile.am
View File

@ -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)

10
ospfd/Makefile.am
View File

@ -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

8
solaris/prototype.dev.in
View File

@ -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

12
solaris/prototype.libs.in
View File

@ -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