From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 15 Sep 2015 09:19:46 +0000 (-0700)
Subject: build: make libraries self-reliant
X-Git-Tag: frr-2.0-rc1~711
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8f5e9238dd384e1e375ec0db479ef2fbbe46d520;p=mirror%2Ffrr.git

build: make libraries self-reliant

libospf and libospfclient both need libzebra, so they should link
against it. The days of libtool propagating upwards such dependencies
are nearing their end...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit d8d5c60ecfab4dd609a07b4baa00d735f59002b9)
---

diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am
index aa156373d1..f54481c924 100644
--- a/ospfclient/Makefile.am
+++ b/ospfclient/Makefile.am
@@ -5,6 +5,7 @@ AM_CFLAGS = $(WERROR)
 
 lib_LTLIBRARIES = libospfapiclient.la
 libospfapiclient_la_LDFLAGS = -version-info 0:0:0
+libospfapiclient_la_LIBADD = ../ospfd/libospf.la ../lib/libzebra.la
 
 sbin_PROGRAMS = ospfclient
 
diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index 3ff1ebfc14..207941e3a7 100644
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -7,6 +7,7 @@ INSTALL_SDATA=@INSTALL@ -m 600
 
 lib_LTLIBRARIES = libospf.la
 libospf_la_LDFLAGS = -version-info 0:0:0
+libospf_la_LIBADD = ../lib/libzebra.la
 
 sbin_PROGRAMS = ospfd