chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: fix linking order for networkd-wait-only
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 7783882d122a78e3b7c37751dcb139901628627c..0232e75807e2fd5b0824f77f56db8b65ff5a60a8 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-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) \
@@
-4023,8
+4025,14
@@
systemd_timesyncd_LDADD = \
libsystemd-shared.la \
-lm
libsystemd-shared.la \
-lm
-
noinst
_PROGRAMS += \
+
rootlibexec
_PROGRAMS += \
systemd-timesyncd
systemd-timesyncd
+
+nodist_systemunit_DATA += \
+ units/systemd-timesyncd.service
+
+EXTRA_DIST += \
+ units/systemd-timesyncd.service.in
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-4179,8
+4187,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
@@
-4194,7
+4204,8
@@
tests += \
EXTRA_DIST += \
src/network/networkd-network-gperf.gperf \
src/network/networkd-netdev-gperf.gperf \
EXTRA_DIST += \
src/network/networkd-network-gperf.gperf \
src/network/networkd-netdev-gperf.gperf \
- units/systemd-networkd.service.in
+ units/systemd-networkd.service.in \
+ units/systemd-networkd-wait-online.service.in
CLEANFILES += \
src/network/networkd-network-gperf.c \
CLEANFILES += \
src/network/networkd-network-gperf.c \
@@
-5150,7
+5161,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: \