X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=c5667c3a63c7c384b2ae98de1905a0a0b1352012;hp=df5d73bf87f6d2672ccc40f8ab151805af89b4df;hb=a4705396adbf1a8a3e52ed133d9b1f12cb13e77e;hpb=cfc59d713d6d8e4536c4103368a9a48ca6cea833 diff --git a/Makefile.am b/Makefile.am index df5d73bf8..c5667c3a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -746,12 +746,14 @@ 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 \ src/shared/refcnt.h \ src/shared/udev-util.h \ src/shared/bus-errors.h \ + src/shared/bus-errors.c \ src/shared/device-nodes.c \ src/shared/device-nodes.h \ src/shared/util.c \ @@ -774,7 +776,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/hashmap.h \ src/shared/siphash24.c \ src/shared/siphash24.h \ - src/shared/set.c \ src/shared/set.h \ src/shared/fdset.c \ src/shared/fdset.h \ @@ -881,12 +882,10 @@ libsystemd_shared_la_SOURCES = \ src/shared/copy.h \ src/shared/base-filesystem.c \ src/shared/base-filesystem.h \ - src/shared/memfd.c \ - src/shared/memfd.h \ + src/shared/memfd-util.c \ + src/shared/memfd-util.h \ src/shared/uid-range.c \ src/shared/uid-range.h \ - src/shared/switch-root.h \ - src/shared/switch-root.c \ src/shared/nss-util.h if HAVE_UTMP @@ -934,6 +933,8 @@ libsystemd_label_la_SOURCES = \ src/shared/mkdir-label.c \ src/shared/ask-password-api.c \ src/shared/ask-password-api.h \ + src/shared/switch-root.h \ + src/shared/switch-root.c \ src/shared/fileio-label.c \ src/shared/fileio-label.h \ src/shared/dev-setup.c \ @@ -1347,6 +1348,7 @@ tests += \ test-hashmap \ test-set \ test-list \ + test-unaligned \ test-tables \ test-device-nodes \ test-xml \ @@ -1359,7 +1361,9 @@ tests += \ test-ratelimit \ test-condition-util \ test-uid-range \ - test-bus-policy + test-bus-policy \ + test-locale-util \ + test-copy EXTRA_DIST += \ test/a.service \ @@ -1503,13 +1507,26 @@ test_async_SOURCES = \ test_async_LDADD = \ libsystemd-shared.la +test_locale_util_SOURCES = \ + src/test/test-locale-util.c + +test_locale_util_LDADD = \ + libsystemd-shared.la + +test_copy_SOURCES = \ + src/test/test-copy.c + +test_copy_LDADD = \ + libsystemd-shared.la + test_condition_util_SOURCES = \ src/test/test-condition-util.c test_condition_util_LDADD = \ libsystemd-shared.la \ - libsystemd-internal.la - + libsystemd-internal.la \ + libsystemd-capability.la \ + libsystemd-label.la test_fdset_SOURCES = \ src/test/test-fdset.c @@ -1527,6 +1544,7 @@ test_util_SOURCES = \ src/test/test-util.c test_util_LDADD = \ + -lm \ libsystemd-core.la test_uid_range_SOURCES = \ @@ -1611,6 +1629,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 @@ -2593,8 +2617,7 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-network/network-util.c nodist_libsystemd_internal_la_SOURCES = \ - src/libsystemd/libsystemd.sym \ - src/libsystemd/sd-bus/bus-error-mapping.c + src/libsystemd/libsystemd.sym libsystemd_internal_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -2632,13 +2655,11 @@ noinst_LTLIBRARIES += \ EXTRA_DIST += \ src/libsystemd/libsystemd.sym.m4 \ src/libsystemd/libsystemd.pc.in \ - src/libsystemd/sd-bus/bus-error-mapping.gperf \ src/libsystemd/sd-bus/DIFFERENCES \ src/libsystemd/sd-bus/GVARIANT-SERIALIZATION CLEANFILES += \ - src/libsystemd/libsystemd.sym \ - src/libsystemd/sd-bus/bus-error-mapping.c + src/libsystemd/libsystemd.sym BUILT_SOURCES += \ src/libsystemd/libsystemd.sym @@ -2939,6 +2960,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 \ @@ -2953,6 +2975,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 \ @@ -3012,6 +3035,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 \ @@ -3041,6 +3072,9 @@ tests += \ test-icmp6-rs \ test-dhcp6-client +manual_tests += \ + test-pppoe + # ------------------------------------------------------------------------------ if ENABLE_TERMINAL noinst_LTLIBRARIES += \ @@ -3454,7 +3488,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 \ @@ -3468,7 +3503,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. @@ -3502,7 +3538,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) @@ -4041,6 +4078,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 @@ -4192,7 +4231,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 \ @@ -4211,7 +4251,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 \ @@ -4402,6 +4443,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 @@ -5169,11 +5213,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 \ @@ -6248,3 +6290,6 @@ print-%: git-contrib: @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u + +EXTRA_DIST += \ + tools/gdb-sd_dump_hashmaps.py