[systemd-commits] Makefile.am

[Tom Gundersen]

 Makefile.am |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit e59749b1f8a960060b7b8e850cc79f97ddaf2db4
Author: Tom Gundersen <teg at jklm.no>
Date:   Mon Feb 3 15:25:45 2014 +0100

    build-sys: move -lresolv out of CFLAGS
    
    Thomas H.P. Andersen <phomes at 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 84e3b35..8af29d1 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) \