From: Tom Gundersen <teg@jklm.no>
Date: Mon, 3 Feb 2014 14:25:45 +0000 (+0100)
Subject: build-sys: move -lresolv out of CFLAGS
X-Git-Tag: v209~259
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e59749b1f8a960060b7b8e850cc79f97ddaf2db4

build-sys: move -lresolv out of CFLAGS

Thomas H.P. Andersen <phomes@gmail.com> wrote:
> Does -lresolv belong in libsystemd_la_CFLAGS? I would have thought
> that it should be in LIBADD for the lib and LDADD for the test.
---

diff --git a/Makefile.am b/Makefile.am
index 84e3b35fa..8af29d160 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2039,12 +2039,12 @@ nodist_libsystemd_la_SOURCES = \
 
 libsystemd_la_LIBADD = \
 	libsystemd-daemon-internal.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	-lresolv
 
 libsystemd_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	-pthread \
-	-lresolv
+	-pthread
 
 libsystemd_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -2316,7 +2316,8 @@ test_resolve_SOURCES = \
 
 test_resolve_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	-lresolv
 
 test_resolve_CFLAGS = \
 	$(AM_CFLAGS) \