ospfd: make libfrrospf a private non-dynamic lib

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

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/debian/frr.lintian-overrides b/debian/frr.lintian-overrides
index 01c623eb227990dbe2d66845dc4a3a9dcc9d2dd6..e21bd9256de01410cb283157c56b135ad7db2dd5 100644 (file)
--- a/debian/frr.lintian-overrides
+++ b/debian/frr.lintian-overrides
@@ -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

diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index fec7503619bb05291bab2a3563c38e441416a87b..71e0df0dc53202864313b0efcaadc65cc4a3e912 100644 (file)
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -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
 

diff --git a/solaris/prototype.dev.in b/solaris/prototype.dev.in
index f40fbdcd52175b9ba2c5fd5254d1fb97705dc8b7..40d20515c34157b9ed357bc1cf548dc6b9e2596f 100644 (file)
--- a/solaris/prototype.dev.in
+++ b/solaris/prototype.dev.in
@@ -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

diff --git a/solaris/prototype.libs.in b/solaris/prototype.libs.in
index 07fe333bad43816c286c6d056d7f715530b7111f..bd8e3e4fe7c55f07c3ed1f433f7706112eac0922 100644 (file)
--- a/solaris/prototype.libs.in
+++ b/solaris/prototype.libs.in
@@ -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