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 library link order
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 65a7ffeb2720ea440f6ce6c16843597701b894e5..3d9e5c1c4bbb4eb384fcd272905b83cf5448197f 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-59,9
+59,9
@@
LIBSYSTEMD_JOURNAL_CURRENT=11
LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
-LIBSYSTEMD_CURRENT=
0
-LIBSYSTEMD_REVISION=
2
-LIBSYSTEMD_AGE=
0
+LIBSYSTEMD_CURRENT=
1
+LIBSYSTEMD_REVISION=
0
+LIBSYSTEMD_AGE=
1
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-779,8
+779,6
@@
libsystemd_shared_la_SOURCES = \
src/shared/ima-util.h \
src/shared/ptyfwd.c \
src/shared/ptyfwd.h \
src/shared/ima-util.h \
src/shared/ptyfwd.c \
src/shared/ptyfwd.h \
- src/shared/net-util.c \
- src/shared/net-util.h \
src/shared/errno-list.c \
src/shared/errno-list.h \
src/shared/af-list.c \
src/shared/errno-list.c \
src/shared/errno-list.h \
src/shared/af-list.c \
@@
-1021,8
+1019,6
@@
libsystemd_core_la_SOURCES = \
src/core/condition.h \
src/core/namespace.c \
src/core/namespace.h \
src/core/condition.h \
src/core/namespace.c \
src/core/namespace.h \
- src/core/tcpwrap.c \
- src/core/tcpwrap.h \
src/core/build.h \
src/core/sysfs-show.h \
src/core/switch-root.h \
src/core/build.h \
src/core/sysfs-show.h \
src/core/switch-root.h \
@@
-1048,7
+1044,6
@@
nodist_libsystemd_core_la_SOURCES = \
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
- $(LIBWRAP_CFLAGS) \
$(PAM_CFLAGS) \
$(AUDIT_CFLAGS) \
$(CAP_CFLAGS) \
$(PAM_CFLAGS) \
$(AUDIT_CFLAGS) \
$(CAP_CFLAGS) \
@@
-1064,7
+1059,6
@@
libsystemd_core_la_LIBADD = \
libudev-internal.la \
libsystemd-shared.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la \
libsystemd-internal.la \
- $(LIBWRAP_LIBS) \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
$(CAP_LIBS) \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
$(CAP_LIBS) \
@@
-1181,7
+1175,8
@@
manual_tests += \
test-install \
test-watchdog \
test-log \
test-install \
test-watchdog \
test-log \
- test-ipcrm
+ test-ipcrm \
+ test-rtnl-manual
tests += \
test-job-type \
tests += \
test-job-type \
@@
-1404,6
+1399,14
@@
test_ipcrm_LDADD = \
libsystemd-shared.la \
-lrt
libsystemd-shared.la \
-lrt
+test_rtnl_manual_SOURCES = \
+ src/test/test-rtnl-manual.c
+
+test_rtnl_manual_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la \
+ -lkmod
+
test_ellipsize_SOURCES = \
src/test/test-ellipsize.c
test_ellipsize_SOURCES = \
src/test/test-ellipsize.c
@@
-2106,8
+2109,6
@@
libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-rtnl/rtnl-message.c \
src/libsystemd/sd-rtnl/rtnl-util.h \
src/libsystemd/sd-rtnl/rtnl-util.c \
src/libsystemd/sd-rtnl/rtnl-message.c \
src/libsystemd/sd-rtnl/rtnl-util.h \
src/libsystemd/sd-rtnl/rtnl-util.c \
- src/libsystemd/sd-resolve/sd-resolve.c \
- src/libsystemd/sd-resolve/resolve-util.h \
src/libsystemd/sd-id128/sd-id128.c \
src/libsystemd/sd-daemon/sd-daemon.c \
src/libsystemd/sd-login/sd-login.c
src/libsystemd/sd-id128/sd-id128.c \
src/libsystemd/sd-daemon/sd-daemon.c \
src/libsystemd/sd-login/sd-login.c
@@
-2123,8
+2124,17
@@
libsystemd_internal_la_CFLAGS = \
libsystemd_internal_la_LIBADD = \
$(RT_LIBS)
libsystemd_internal_la_LIBADD = \
$(RT_LIBS)
+libsystemd_resolve_la_SOURCES = \
+ src/libsystemd/sd-resolve/sd-resolve.c \
+ src/libsystemd/sd-resolve/resolve-util.h
+
+libsystemd_resolve_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
noinst_LTLIBRARIES += \
noinst_LTLIBRARIES += \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ libsystemd-resolve.la
libsystemd_dump_la_SOURCES = \
src/libsystemd/sd-bus/bus-dump.c \
libsystemd_dump_la_SOURCES = \
src/libsystemd/sd-bus/bus-dump.c \
@@
-2153,6
+2163,7
@@
BUILT_SOURCES += \
libsystemd_la_SOURCES = \
$(libsystemd_internal_la_SOURCES) \
libsystemd_la_SOURCES = \
$(libsystemd_internal_la_SOURCES) \
+ $(libsystemd_resolve_la_SOURCES) \
$(libsystemd_journal_internal_la_SOURCES)
nodist_libsystemd_la_SOURCES = \
$(libsystemd_journal_internal_la_SOURCES)
nodist_libsystemd_la_SOURCES = \
@@
-2417,6
+2428,7
@@
test_resolve_SOURCES = \
test_resolve_LDADD = \
libsystemd-internal.la \
test_resolve_LDADD = \
libsystemd-internal.la \
+ libsystemd-resolve.la \
libsystemd-shared.la \
-lresolv
libsystemd-shared.la \
-lresolv
@@
-2460,7
+2472,9
@@
libsystemd_network_la_SOURCES = \
src/libsystemd-network/sd-ipv4ll.c \
src/libsystemd-network/ipv4ll-network.c \
src/libsystemd-network/ipv4ll-packet.c \
src/libsystemd-network/sd-ipv4ll.c \
src/libsystemd-network/ipv4ll-network.c \
src/libsystemd-network/ipv4ll-packet.c \
- src/libsystemd-network/ipv4ll-internal.h
+ src/libsystemd-network/ipv4ll-internal.h \
+ src/libsystemd-network/network-internal.c \
+ src/libsystemd-network/network-internal.h
libsystemd_network_la_LIBADD = \
libsystemd-label.la \
libsystemd_network_la_LIBADD = \
libsystemd-label.la \
@@
-2720,6
+2734,7
@@
libudev_core_la_LIBADD = \
libudev-internal.la \
libsystemd-label.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-label.la \
libsystemd-internal.la \
+ libsystemd-network.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@
-3513,8
+3528,8
@@
systemd_coredump_SOURCES = \
systemd_coredump_LDADD = \
libsystemd-journal-internal.la \
libsystemd-label.la \
systemd_coredump_LDADD = \
libsystemd-journal-internal.la \
libsystemd-label.la \
- libsystemd-
shared
.la \
- libsystemd-
internal
.la
+ libsystemd-
internal
.la \
+ libsystemd-
shared
.la
rootlibexec_PROGRAMS += \
systemd-coredump
rootlibexec_PROGRAMS += \
systemd-coredump