summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-04-29 15:44:31 +0200
committerLennart Poettering <lennart@poettering.net>2014-04-29 15:45:16 +0200
commit93f1bcf40030a9e98bf2b71c177cbea36c64d5c9 (patch)
tree96f63cc636ffa43f92f805a7f0bac73d48faa18d /Makefile.am
parent4c06153f7b7d1af4fc8df4602c1d6714734bf9fd (diff)
sd-resolve: rework sd-resolve to be callback based, similar in style to sd-bus and sd-event
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am17
1 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 365fa548bb..45cf7d930a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2144,6 +2144,9 @@ libsystemd_resolve_la_CFLAGS = \
$(AM_CFLAGS) \
-pthread
+libsystemd_resolve_la_LIBADD = \
+ -lresolv
+
noinst_LTLIBRARIES += \
libsystemd-internal.la \
libsystemd-resolve.la
@@ -2183,6 +2186,7 @@ nodist_libsystemd_la_SOURCES = \
libsystemd_la_CFLAGS = \
$(libsystemd_internal_la_CFLAGS) \
+ $(libsystemd_resolve_la_CFLAGS) \
$(libsystemd_journal_internal_la_CFLAGS)
libsystemd_la_LDFLAGS = \
@@ -2192,9 +2196,9 @@ libsystemd_la_LDFLAGS = \
libsystemd_la_LIBADD = \
libsystemd-shared.la \
+ $(libsystemd_internal_la_LIBADD) \
$(libsystemd_journal_internal_la_LIBADD) \
- $(RT_LIBS) \
- -lresolv
+ $(libsystemd_resolve_la_LIBADD)
libsystemd-install-hook:
libname=libsystemd.so && $(move-to-rootlibdir)
@@ -2435,14 +2439,12 @@ test_rtnl_LDADD = \
libsystemd-shared.la
test_resolve_SOURCES = \
- src/systemd/sd-resolve.h \
src/libsystemd/sd-resolve/test-resolve.c
test_resolve_LDADD = \
- libsystemd-internal.la \
libsystemd-resolve.la \
- libsystemd-shared.la \
- -lresolv
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_resolve_CFLAGS = \
$(AM_CFLAGS) \
@@ -5157,7 +5159,8 @@ test-libsystemd-sym.c: \
src/systemd/sd-daemon.h \
src/systemd/sd-login.h \
src/systemd/sd-bus.h \
- src/systemd/sd-utf8.h
+ src/systemd/sd-utf8.h \
+ src/systemd/sd-resolve.h
$(generate-sym-test)
test-libudev-sym.c: \