X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=698a7b0f3f68decda5b63d195f84086a4d74434f;hb=bc9992978cd1456b5bb79e72e8cf7a2331d3a7c6;hp=00465e8367ccd9caa7a07787e3a42f4928bbef9d;hpb=2b89a960604d44ea1483c0d99bfb567dab9c3aa1;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 00465e836..698a7b0f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -746,6 +746,7 @@ libsystemd_shared_la_SOURCES = \ src/shared/securebits.h \ src/shared/special.h \ src/shared/list.h \ + src/shared/unaligned.h \ src/shared/macro.h \ src/shared/def.h \ src/shared/sparse-endian.h \ @@ -860,8 +861,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/audit.h \ src/shared/xml.c \ src/shared/xml.h \ - src/shared/condition-util.c \ - src/shared/condition-util.h \ + src/shared/condition.c \ + src/shared/condition.h \ src/shared/bus-label.c \ src/shared/bus-label.h \ src/shared/gpt.h \ @@ -1131,8 +1132,6 @@ libsystemd_core_la_SOURCES = \ src/core/mount-setup.h \ src/core/loopback-setup.h \ src/core/loopback-setup.c \ - src/core/condition.c \ - src/core/condition.h \ src/core/namespace.c \ src/core/namespace.h \ src/core/build.h \ @@ -1322,6 +1321,7 @@ tests += \ test-env-replace \ test-strbuf \ test-strv \ + test-path \ test-path-util \ test-strxcpyx \ test-unit-name \ @@ -1347,6 +1347,7 @@ tests += \ test-hashmap \ test-set \ test-list \ + test-unaligned \ test-tables \ test-device-nodes \ test-xml \ @@ -1357,10 +1358,11 @@ tests += \ test-capability \ test-async \ test-ratelimit \ - test-condition-util \ + test-condition \ test-uid-range \ test-bus-policy \ - test-locale-util + test-locale-util \ + test-copy EXTRA_DIST += \ test/a.service \ @@ -1510,13 +1512,20 @@ test_locale_util_SOURCES = \ test_locale_util_LDADD = \ libsystemd-shared.la -test_condition_util_SOURCES = \ - src/test/test-condition-util.c +test_copy_SOURCES = \ + src/test/test-copy.c -test_condition_util_LDADD = \ - libsystemd-shared.la \ - libsystemd-internal.la +test_copy_LDADD = \ + libsystemd-shared.la +test_condition_SOURCES = \ + src/test/test-condition.c + +test_condition_LDADD = \ + libsystemd-shared.la \ + libsystemd-internal.la \ + libsystemd-capability.la \ + libsystemd-label.la test_fdset_SOURCES = \ src/test/test-fdset.c @@ -1534,6 +1543,7 @@ test_util_SOURCES = \ src/test/test-util.c test_util_LDADD = \ + -lm \ libsystemd-core.la test_uid_range_SOURCES = \ @@ -1618,6 +1628,12 @@ test_xml_LDADD = \ test_list_SOURCES = \ src/test/test-list.c +test_unaligned_LDADD = \ + libsystemd-core.la + +test_unaligned_SOURCES = \ + src/test/test-unaligned.c + test_list_LDADD = \ libsystemd-core.la @@ -1794,6 +1810,15 @@ test_path_util_SOURCES = \ test_path_util_LDADD = \ libsystemd-shared.la +test_path_SOURCES = \ + src/test/test-path.c + +test_path_CFLAGS = \ + $(AM_CFLAGS) + +test_path_LDADD = \ + libsystemd-core.la + test_strxcpyx_SOURCES = \ src/test/test-strxcpyx.c @@ -2943,6 +2968,7 @@ libsystemd_network_la_SOURCES = \ src/systemd/sd-icmp6-nd.h \ src/systemd/sd-dhcp6-client.h \ src/systemd/sd-dhcp6-lease.h \ + src/systemd/sd-pppoe.h \ src/libsystemd-network/sd-dhcp-client.c \ src/libsystemd-network/sd-dhcp-server.c \ src/libsystemd-network/dhcp-network.c \ @@ -2957,6 +2983,7 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/ipv4ll-network.c \ src/libsystemd-network/ipv4ll-packet.c \ src/libsystemd-network/ipv4ll-internal.h \ + src/libsystemd-network/sd-pppoe.c \ src/libsystemd-network/network-internal.c \ src/libsystemd-network/network-internal.h \ src/libsystemd-network/sd-icmp6-nd.c \ @@ -3016,6 +3043,14 @@ test_ipv4ll_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +test_pppoe_SOURCES = \ + src/systemd/sd-pppoe.h \ + src/libsystemd-network/test-pppoe.c + +test_pppoe_LDADD = \ + libsystemd-network.la \ + libsystemd-shared.la + test_icmp6_rs_SOURCES = \ src/systemd/sd-dhcp6-client.h \ src/systemd/sd-icmp6-nd.h \ @@ -3045,6 +3080,9 @@ tests += \ test-icmp6-rs \ test-dhcp6-client +manual_tests += \ + test-pppoe + # ------------------------------------------------------------------------------ if ENABLE_TERMINAL noinst_LTLIBRARIES += \ @@ -3458,7 +3496,8 @@ systemd_udevd_SOURCES = \ src/udev/udevd.c systemd_udevd_LDADD = \ - libudev-core.la + libudev-core.la \ + libsystemd-capability.la udevadm_SOURCES = \ src/udev/udevadm.c \ @@ -3472,7 +3511,8 @@ udevadm_SOURCES = \ src/udev/udevadm-test-builtin.c udevadm_LDADD = \ - libudev-core.la + libudev-core.la \ + libsystemd-capability.la # Update hwdb on installation. Do not bother if installing # in DESTDIR, since this is likely for packaging purposes. @@ -3506,7 +3546,8 @@ test_udev_SOURCES = \ src/test/test-udev.c test_udev_LDADD = \ - libudev-core.la \ + libudev-core.la \ + libsystemd-capability.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) \ $(SELINUX_LIBS) @@ -4045,6 +4086,8 @@ libsystemd_journal_core_la_SOURCES = \ src/journal/journald-wall.h \ src/journal/journald-native.c \ src/journal/journald-native.h \ + src/journal/journald-audit.c \ + src/journal/journald-audit.h \ src/journal/journald-rate-limit.c \ src/journal/journald-rate-limit.h \ src/journal/journal-internal.h @@ -4196,7 +4239,8 @@ bin_PROGRAMS += \ dist_systemunit_DATA += \ units/systemd-journald.socket \ - units/systemd-journald-dev-log.socket + units/systemd-journald-dev-log.socket \ + units/systemd-journald-audit.socket nodist_systemunit_DATA += \ units/systemd-journald.service \ @@ -4215,7 +4259,8 @@ dist_catalog_DATA = \ SOCKETS_TARGET_WANTS += \ systemd-journald.socket \ - systemd-journald-dev-log.socket + systemd-journald-dev-log.socket \ + systemd-journald-audit.socket SYSINIT_TARGET_WANTS += \ systemd-journald.service \ @@ -4406,6 +4451,9 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-vconsole-setup.service +dist_udevrules_DATA += \ + src/vconsole/90-vconsole.rules + SYSINIT_TARGET_WANTS += \ systemd-vconsole-setup.service endif @@ -5173,11 +5221,9 @@ networkctl_LDADD = \ test_network_SOURCES = \ src/network/test-network.c -test_network_CFLAGS = \ - $(AM_CFLAGS) - test_network_LDADD = \ - libsystemd-networkd-core.la + libsystemd-networkd-core.la \ + libsystemd-capability.la test_network_tables_SOURCES = \ src/network/test-network-tables.c \