chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timesyncd: make sure to reread /etc/resolv.conf when we try the next NTP server
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 365fa548bb034b32f9c6069a556507c9faaeac33..cbb405b15e7107c4674abecbb5392f1c84ea7808 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-798,7
+798,9
@@
libsystemd_shared_la_SOURCES = \
src/shared/clean-ipc.h \
src/shared/clean-ipc.c \
src/shared/login-shared.c \
src/shared/clean-ipc.h \
src/shared/clean-ipc.c \
src/shared/login-shared.c \
- src/shared/login-shared.h
+ src/shared/login-shared.h \
+ src/shared/async.c \
+ src/shared/async.h
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
@@
-1028,8
+1030,6
@@
libsystemd_core_la_SOURCES = \
src/core/killall.c \
src/core/audit-fd.c \
src/core/audit-fd.h \
src/core/killall.c \
src/core/audit-fd.c \
src/core/audit-fd.h \
- src/core/async.c \
- src/core/async.h \
src/core/show-status.c \
src/core/show-status.h
src/core/show-status.c \
src/core/show-status.h
@@
-2144,6
+2144,9
@@
libsystemd_resolve_la_CFLAGS = \
$(AM_CFLAGS) \
-pthread
$(AM_CFLAGS) \
-pthread
+libsystemd_resolve_la_LIBADD = \
+ -lresolv
+
noinst_LTLIBRARIES += \
libsystemd-internal.la \
libsystemd-resolve.la
noinst_LTLIBRARIES += \
libsystemd-internal.la \
libsystemd-resolve.la
@@
-2183,6
+2186,7
@@
nodist_libsystemd_la_SOURCES = \
libsystemd_la_CFLAGS = \
$(libsystemd_internal_la_CFLAGS) \
libsystemd_la_CFLAGS = \
$(libsystemd_internal_la_CFLAGS) \
+ $(libsystemd_resolve_la_CFLAGS) \
$(libsystemd_journal_internal_la_CFLAGS)
libsystemd_la_LDFLAGS = \
$(libsystemd_journal_internal_la_CFLAGS)
libsystemd_la_LDFLAGS = \
@@
-2192,9
+2196,9
@@
libsystemd_la_LDFLAGS = \
libsystemd_la_LIBADD = \
libsystemd-shared.la \
libsystemd_la_LIBADD = \
libsystemd-shared.la \
+ $(libsystemd_internal_la_LIBADD) \
$(libsystemd_journal_internal_la_LIBADD) \
$(libsystemd_journal_internal_la_LIBADD) \
- $(RT_LIBS) \
- -lresolv
+ $(libsystemd_resolve_la_LIBADD)
libsystemd-install-hook:
libname=libsystemd.so && $(move-to-rootlibdir)
libsystemd-install-hook:
libname=libsystemd.so && $(move-to-rootlibdir)
@@
-2435,14
+2439,12
@@
test_rtnl_LDADD = \
libsystemd-shared.la
test_resolve_SOURCES = \
libsystemd-shared.la
test_resolve_SOURCES = \
- src/systemd/sd-resolve.h \
src/libsystemd/sd-resolve/test-resolve.c
test_resolve_LDADD = \
src/libsystemd/sd-resolve/test-resolve.c
test_resolve_LDADD = \
- libsystemd-internal.la \
libsystemd-resolve.la \
libsystemd-resolve.la \
- libsystemd-
shared
.la \
- -lresolv
+ libsystemd-
internal
.la \
+ libsystemd-shared.la
test_resolve_CFLAGS = \
$(AM_CFLAGS) \
test_resolve_CFLAGS = \
$(AM_CFLAGS) \
@@
-4021,6
+4023,7
@@
systemd_timesyncd_LDADD = \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
+ libsystemd-resolve.la \
-lm
rootlibexec_PROGRAMS += \
-lm
rootlibexec_PROGRAMS += \
@@
-4185,8
+4188,10
@@
systemd_networkd_wait_online_SOURCES = \
src/network/networkd-wait-online.h
systemd_networkd_wait_online_LDADD = \
src/network/networkd-wait-online.h
systemd_networkd_wait_online_LDADD = \
+ libsystemd-network.la \
+ libudev-internal.la \
libsystemd-internal.la \
libsystemd-internal.la \
- libsystemd-
network
.la
+ libsystemd-
shared
.la
test_network_SOURCES = \
src/network/test-network.c
test_network_SOURCES = \
src/network/test-network.c
@@
-5157,7
+5162,8
@@
test-libsystemd-sym.c: \
src/systemd/sd-daemon.h \
src/systemd/sd-login.h \
src/systemd/sd-bus.h \
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: \
$(generate-sym-test)
test-libudev-sym.c: \