From 4308a8305ac6f57f2a42992931a7da3bc85fdbd4 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 17 Jul 2014 18:04:17 -0400 Subject: [PATCH] core: fix libndp linking We were linking libndp into the NetworkManager binary, but it ought to be marked as a dependency of libNetworkManager, in case a test exercises that code. --- src/Makefile.am | 3 ++- src/rdisc/tests/Makefile.am | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 367b4c85fa..04387c7274 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -57,7 +57,7 @@ sbin_PROGRAMS = NetworkManager NetworkManager_SOURCES = \ main.c -NetworkManager_LDADD = libNetworkManager.la $(LIBNDP_LIBS) +NetworkManager_LDADD = libNetworkManager.la noinst_LTLIBRARIES = libNetworkManager.la @@ -364,6 +364,7 @@ libNetworkManager_la_LIBADD = \ $(LIBNL_LIBS) \ $(POLKIT_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ + $(LIBNDP_LIBS) \ $(LIBDL) \ $(LIBM) diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am index 95922c1bcd..a16f45d671 100644 --- a/src/rdisc/tests/Makefile.am +++ b/src/rdisc/tests/Makefile.am @@ -26,6 +26,5 @@ noinst_PROGRAMS = \ rdisc_SOURCES = \ rdisc.c rdisc_LDADD = \ - $(top_builddir)/src/libNetworkManager.la \ - $(LIBNDP_LIBS) + $(top_builddir)/src/libNetworkManager.la