X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=43d1d3ce102bdfd0f4d222720346e65055a105e5;hb=7680857ab80c012021b672aac920e0453b116460;hp=f1a972dc6a857e2c3ac24505b9128430cb0c9639;hpb=4a0a74179fcfb85c456794fd91fa2ae5d4d3bc8f;p=elogind.git diff --git a/Makefile.am b/Makefile.am index f1a972dc6..43d1d3ce1 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 \ @@ -859,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 \ @@ -901,9 +903,13 @@ nodist_libsystemd_shared_la_SOURCES = \ libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ + $(CAP_CFLAGS) \ $(SECCOMP_CFLAGS) \ -pthread +libsystemd_shared_la_LIBADD = \ + $(CAP_LIBS) + # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-units.la @@ -1130,8 +1136,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 \ @@ -1321,6 +1325,7 @@ tests += \ test-env-replace \ test-strbuf \ test-strv \ + test-path \ test-path-util \ test-strxcpyx \ test-unit-name \ @@ -1346,6 +1351,7 @@ tests += \ test-hashmap \ test-set \ test-list \ + test-unaligned \ test-tables \ test-device-nodes \ test-xml \ @@ -1356,9 +1362,11 @@ tests += \ test-capability \ test-async \ test-ratelimit \ - test-condition-util \ + test-condition \ test-uid-range \ - test-bus-policy + test-bus-policy \ + test-locale-util \ + test-copy EXTRA_DIST += \ test/a.service \ @@ -1502,19 +1510,32 @@ test_async_SOURCES = \ test_async_LDADD = \ libsystemd-shared.la -test_condition_util_SOURCES = \ - src/test/test-condition-util.c +test_locale_util_SOURCES = \ + src/test/test-locale-util.c -test_condition_util_LDADD = \ - libsystemd-shared.la \ - libsystemd-internal.la +test_locale_util_LDADD = \ + libsystemd-shared.la + +test_copy_SOURCES = \ + src/test/test-copy.c + +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 test_fdset_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_ratelimit_SOURCES = \ src/test/test-ratelimit.c @@ -1526,31 +1547,32 @@ test_util_SOURCES = \ src/test/test-util.c test_util_LDADD = \ - libsystemd-core.la + -lm \ + libsystemd-shared.la test_uid_range_SOURCES = \ src/test/test-uid-range.c test_uid_range_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_socket_util_SOURCES = \ src/test/test-socket-util.c test_socket_util_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_ring_SOURCES = \ src/test/test-ring.c test_ring_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_barrier_SOURCES = \ src/test/test-barrier.c test_barrier_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_pty_SOURCES = \ src/test/test-pty.c @@ -1593,13 +1615,13 @@ test_hashmap_SOURCES = \ src/test/test-hashmap-plain.c test_hashmap_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_set_SOURCES = \ src/test/test-set.c test_set_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_xml_SOURCES = \ src/test/test-xml.c @@ -1611,7 +1633,13 @@ test_list_SOURCES = \ src/test/test-list.c test_list_LDADD = \ - libsystemd-core.la + libsystemd-shared.la + +test_unaligned_LDADD = \ + libsystemd-shared.la + +test_unaligned_SOURCES = \ + src/test/test-unaligned.c test_tables_SOURCES = \ src/test/test-tables.c \ @@ -1641,19 +1669,19 @@ test_prioq_SOURCES = \ src/test/test-prioq.c test_prioq_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_fileio_SOURCES = \ src/test/test-fileio.c test_fileio_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_time_SOURCES = \ src/test/test-time.c test_time_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_architecture_SOURCES = \ src/test/test-architecture.c @@ -1665,7 +1693,7 @@ test_log_SOURCES = \ src/test/test-log.c test_log_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_ipcrm_SOURCES = \ src/test/test-ipcrm.c @@ -1690,13 +1718,13 @@ test_ellipsize_SOURCES = \ src/test/test-ellipsize.c test_ellipsize_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_date_SOURCES = \ src/test/test-date.c test_date_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_sleep_SOURCES = \ src/test/test-sleep.c @@ -1741,8 +1769,7 @@ test_cgroup_mask_SOURCES = \ src/test/test-cgroup-mask.c test_cgroup_mask_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DTEST_DIR=\"$(abs_top_srcdir)/test\" + $(AM_CPPFLAGS) test_cgroup_mask_CFLAGS = \ $(AM_CFLAGS) \ @@ -1786,6 +1813,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 @@ -1811,8 +1847,7 @@ test_sched_prio_SOURCES = \ src/test/test-sched-prio.c test_sched_prio_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DTEST_DIR=\"$(abs_top_srcdir)/test\" + $(AM_CPPFLAGS) test_sched_prio_CFLAGS = \ $(AM_CFLAGS) \ @@ -1862,7 +1897,8 @@ lcov-report: $(MKDIR_P) $(coverage_dir) lcov $(coverage_opts) --compat-libtool --capture --no-external \ | sed 's|$(abspath $(builddir))|$(abspath $(srcdir))|' > $(coverage_dir)/.lcov.info - genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov.info + lcov --remove $(coverage_dir)/.lcov.info --output-file $(coverage_dir)/.lcov-clean.info 'test-*' + genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov-clean.info @echo "Coverage report generated in $(abs_builddir)/$(coverage_dir)/index.html" # lcov doesn't work properly with vpath builds, make sure that bad @@ -2935,6 +2971,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 \ @@ -2949,6 +2986,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 \ @@ -3008,6 +3046,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 \ @@ -3037,6 +3083,9 @@ tests += \ test-icmp6-rs \ test-dhcp6-client +manual_tests += \ + test-pppoe + # ------------------------------------------------------------------------------ if ENABLE_TERMINAL noinst_LTLIBRARIES += \ @@ -3450,7 +3499,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 \ @@ -3464,7 +3514,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. @@ -3498,7 +3549,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) @@ -3880,7 +3932,6 @@ systemd_journal_upload_CFLAGS = \ $(LIBCURL_CFLAGS) systemd_journal_upload_LDADD = \ - libsystemd-core.la \ libsystemd-internal.la \ libsystemd-journal-internal.la \ libsystemd-shared.la \ @@ -4037,6 +4088,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 @@ -4188,7 +4241,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 \ @@ -4207,7 +4261,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 \ @@ -4398,6 +4453,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 @@ -5165,11 +5223,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 \