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

ospfd: make libfrrospf a private non-dynamic lib

Browse Source 
There's no point in installing libospf anymore, now that
libfrrospfclient doesn't link it.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-01-24 23:26:20 +01:00
parent 0a3fc2a5df
commit 3d04dc3854
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/frr.lintian-overrides vendored
View File

@ -1,4 +1,3 @@
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 libfrrospf0 libfrrospfapiclient0 libfrr0

9
ospfd/Makefile.am
View File

@ -5,13 +5,10 @@ AM_CFLAGS = $(WERROR)
DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
INSTALL_SDATA=@INSTALL@ -m 600
lib_LTLIBRARIES = libfrrospf.la
libfrrospf_la_LDFLAGS = -version-info 0:0:0
libfrrospf_la_LIBADD = ../lib/libfrr.la
noinst_LIBRARIES = libfrrospf.a
sbin_PROGRAMS = ospfd
libfrrospf_la_SOURCES = \
libfrrospf_a_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 \
@ -34,7 +31,7 @@ noinst_HEADERS = \
ospfd_SOURCES = ospf_main.c
ospfd_LDADD = libfrrospf.la ../lib/libfrr.la @LIBCAP@ @LIBM@
ospfd_LDADD = libfrrospf.a ../lib/libfrr.la @LIBCAP@ @LIBM@
EXTRA_DIST = OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt

2
solaris/prototype.dev.in
View File

@ -3,8 +3,6 @@ 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@/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

3
solaris/prototype.libs.in
View File

@ -5,9 +5,6 @@ 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@/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