X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=0b32639fae952b5aea1da93a9dcaf7f7f453eac1;hp=ff5f61b5856749afbbe8b1923c4c21f84c9e9ee8;hb=0b906b8d6f901866046636e75e138348afb1d8c0;hpb=875c2e220e2611165e09051c4747971811f1de58 diff --git a/Makefile.am b/Makefile.am index ff5f61b58..0b32639fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -739,6 +739,8 @@ noinst_LTLIBRARIES += \ libsystemd-shared.la libsystemd_shared_la_SOURCES = \ + src/shared/capability.c \ + src/shared/capability.h \ src/shared/linux/auto_dev-ioctl.h \ src/shared/ioprio.h \ src/shared/missing.h \ @@ -861,8 +863,6 @@ 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/bus-label.c \ src/shared/bus-label.h \ src/shared/gpt.h \ @@ -903,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 @@ -941,6 +945,8 @@ libsystemd_label_la_SOURCES = \ src/shared/dev-setup.h \ src/shared/dropin.c \ src/shared/dropin.h \ + src/shared/condition.c \ + src/shared/condition.h \ src/shared/generator.h \ src/shared/generator.c @@ -987,21 +993,6 @@ libsystemd_logs_la_SOURCES = \ src/shared/logs-show.c \ src/shared/logs-show.h -# ------------------------------------------------------------------------------ -noinst_LTLIBRARIES += \ - libsystemd-capability.la - -libsystemd_capability_la_SOURCES = \ - src/shared/capability.c \ - src/shared/capability.h - -libsystemd_capability_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(CAP_CFLAGS) - -libsystemd_capability_la_LIBADD = \ - $(CAP_LIBS) - # ------------------------------------------------------------------------------ if HAVE_ACL noinst_LTLIBRARIES += \ @@ -1132,8 +1123,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 \ @@ -1161,14 +1150,12 @@ libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ $(PAM_CFLAGS) \ $(AUDIT_CFLAGS) \ - $(CAP_CFLAGS) \ $(KMOD_CFLAGS) \ $(APPARMOR_CFLAGS) \ $(SECCOMP_CFLAGS) \ -pthread libsystemd_core_la_LIBADD = \ - libsystemd-capability.la \ libsystemd-units.la \ libsystemd-label.la \ libudev-internal.la \ @@ -1176,7 +1163,6 @@ libsystemd_core_la_LIBADD = \ libsystemd-internal.la \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ - $(CAP_LIBS) \ $(KMOD_LIBS) \ $(APPARMOR_LIBS) \ $(SECCOMP_LIBS) @@ -1323,6 +1309,7 @@ tests += \ test-env-replace \ test-strbuf \ test-strv \ + test-path \ test-path-util \ test-strxcpyx \ test-unit-name \ @@ -1359,7 +1346,7 @@ tests += \ test-capability \ test-async \ test-ratelimit \ - test-condition-util \ + test-condition \ test-uid-range \ test-bus-policy \ test-locale-util \ @@ -1498,8 +1485,7 @@ test_capability_SOURCES = \ src/test/test-capability.c test_capability_LDADD = \ - libsystemd-shared.la \ - libsystemd-capability.la + libsystemd-shared.la test_async_SOURCES = \ src/test/test-async.c @@ -1519,19 +1505,20 @@ test_copy_SOURCES = \ 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 +test_condition_SOURCES = \ + src/test/test-condition.c +test_condition_LDADD = \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la test_fdset_SOURCES = \ src/test/test-fdset.c test_fdset_LDADD = \ - libsystemd-core.la + libsystemd-shared.la \ + libsystemd-internal.la test_ratelimit_SOURCES = \ src/test/test-ratelimit.c @@ -1543,31 +1530,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 @@ -1610,13 +1598,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 @@ -1627,15 +1615,15 @@ test_xml_LDADD = \ test_list_SOURCES = \ src/test/test-list.c +test_list_LDADD = \ + libsystemd-shared.la + test_unaligned_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_unaligned_SOURCES = \ src/test/test-unaligned.c -test_list_LDADD = \ - libsystemd-core.la - test_tables_SOURCES = \ src/test/test-tables.c \ src/shared/test-tables.h \ @@ -1664,19 +1652,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 @@ -1688,7 +1676,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 @@ -1713,13 +1701,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 @@ -1764,8 +1752,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) \ @@ -1809,6 +1796,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 @@ -1834,8 +1830,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) \ @@ -1857,7 +1852,6 @@ test_bus_policy_SOURCES = \ src/bus-proxyd/bus-policy.h test_bus_policy_LDADD = \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -1885,7 +1879,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 @@ -2015,7 +2010,6 @@ systemd_tmpfiles_SOURCES = \ systemd_tmpfiles_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2078,7 +2072,6 @@ systemd_sysusers_SOURCES = \ systemd_sysusers_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2127,7 +2120,6 @@ systemd_firstboot_SOURCES = \ systemd_firstboot_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la \ -lcrypt @@ -2470,7 +2462,6 @@ systemd_nspawn_CFLAGS = \ systemd_nspawn_LDADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la \ @@ -2488,7 +2479,6 @@ systemd_run_SOURCES = \ systemd_run_LDADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2499,7 +2489,6 @@ systemd_bus_proxyd_SOURCES = \ src/bus-proxyd/bus-policy.h systemd_bus_proxyd_LDADD = \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2643,10 +2632,6 @@ libsystemd_dump_la_SOURCES = \ src/libsystemd/sd-bus/bus-dump.c \ src/libsystemd/sd-bus/bus-dump.h -libsystemd_dump_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(CAP_CFLAGS) - noinst_LTLIBRARIES += \ libsystemd-dump.la @@ -2745,19 +2730,16 @@ test_bus_marshal_SOURCES = \ src/libsystemd/sd-bus/test-bus-marshal.c test_bus_marshal_LDADD = \ + libsystemd-dump.la \ libsystemd-internal.la \ libsystemd-shared.la \ - libsystemd-dump.la \ - libsystemd-capability.la \ $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(CAP_LIBS) + $(DBUS_LIBS) test_bus_marshal_CFLAGS = \ $(AM_CFLAGS) \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(CAP_CFLAGS) + $(DBUS_CFLAGS) test_bus_signature_SOURCES = \ src/libsystemd/sd-bus/test-bus-signature.c @@ -2804,15 +2786,12 @@ test_bus_objects_SOURCES = \ test_bus_objects_CFLAGS = \ $(AM_CFLAGS) \ - $(CAP_CFLAGS) \ -pthread test_bus_objects_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-dump.la \ - libsystemd-capability.la \ - $(CAP_LIBS) + libsystemd-internal.la \ + libsystemd-shared.la test_bus_error_SOURCES = \ src/libsystemd/sd-bus/test-bus-error.c @@ -2825,26 +2804,22 @@ test_bus_gvariant_SOURCES = \ src/libsystemd/sd-bus/test-bus-gvariant.c test_bus_gvariant_LDADD = \ + libsystemd-dump.la \ libsystemd-internal.la \ libsystemd-shared.la \ - libsystemd-dump.la \ - libsystemd-capability.la \ - $(GLIB_LIBS) \ - $(CAP_LIBS) + $(GLIB_LIBS) test_bus_gvariant_CFLAGS = \ $(AM_CFLAGS) \ $(GLIB_CFLAGS) - $(CAP_CFLAGS) test_bus_creds_SOURCES = \ src/libsystemd/sd-bus/test-bus-creds.c test_bus_creds_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-dump.la \ - libsystemd-capability.la + libsystemd-internal.la \ + libsystemd-shared.la test_bus_match_SOURCES = \ src/libsystemd/sd-bus/test-bus-match.c @@ -2857,15 +2832,9 @@ test_bus_kernel_SOURCES = \ src/libsystemd/sd-bus/test-bus-kernel.c test_bus_kernel_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-dump.la \ - libsystemd-capability.la \ - $(CAP_LIBS) - -test_bus_kernel_CFLAGS = \ - $(AM_CFLAGS) \ - $(CAP_CFLAGS) + libsystemd-internal.la \ + libsystemd-shared.la test_bus_kernel_bloom_SOURCES = \ src/libsystemd/sd-bus/test-bus-kernel-bloom.c @@ -2885,15 +2854,9 @@ test_bus_zero_copy_SOURCES = \ src/libsystemd/sd-bus/test-bus-zero-copy.c test_bus_zero_copy_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-dump.la \ - libsystemd-capability.la \ - $(CAP_LIBS) - -test_bus_zero_copy_CFLAGS = \ - $(AM_CFLAGS) \ - $(CAP_CFLAGS) + libsystemd-internal.la \ + libsystemd-shared.la test_bus_introspect_SOURCES = \ src/libsystemd/sd-bus/test-bus-introspect.c @@ -2932,15 +2895,9 @@ busctl_SOURCES = \ src/libsystemd/sd-bus/busctl.c busctl_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-dump.la \ - libsystemd-capability.la \ - $(CAP_LIBS) - -busctl_CFLAGS = \ - $(AM_CFLAGS) \ - $(CAP_CFLAGS) + libsystemd-internal.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -3534,7 +3491,7 @@ test_udev_SOURCES = \ src/test/test-udev.c test_udev_LDADD = \ - libudev-core.la \ + libudev-core.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) \ $(SELINUX_LIBS) @@ -3916,7 +3873,6 @@ systemd_journal_upload_CFLAGS = \ $(LIBCURL_CFLAGS) systemd_journal_upload_LDADD = \ - libsystemd-core.la \ libsystemd-internal.la \ libsystemd-journal-internal.la \ libsystemd-shared.la \ @@ -4085,7 +4041,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \ libsystemd_journal_core_la_LIBADD = \ libsystemd-journal-internal.la \ libudev-internal.la \ - libsystemd-capability.la \ libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -4438,6 +4393,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 @@ -4799,7 +4757,6 @@ systemd_timesyncd_LDADD = \ libsystemd-resolve.la \ libsystemd-network.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la \ -lm @@ -5000,7 +4957,6 @@ CLEANFILES += \ src/resolve/resolved-gperf.c systemd_resolved_LDADD = \ - libsystemd-capability.la \ libsystemd-network.la \ libsystemd-label.la \ libsystemd-internal.la \ @@ -5053,7 +5009,6 @@ test_dns_domain_SOURCES = \ src/resolve/test-dns-domain.c test_dns_domain_LDADD = \ - libsystemd-capability.la \ libsystemd-network.la \ libsystemd-label.la \ libsystemd-internal.la \ @@ -5117,8 +5072,7 @@ systemd_networkd_SOURCES = \ src/network/networkd.c systemd_networkd_LDADD = \ - libsystemd-networkd-core.la \ - libsystemd-capability.la + libsystemd-networkd-core.la noinst_LTLIBRARIES += \ libsystemd-networkd-core.la @@ -5205,9 +5159,6 @@ networkctl_LDADD = \ test_network_SOURCES = \ src/network/test-network.c -test_network_CFLAGS = \ - $(AM_CFLAGS) - test_network_LDADD = \ libsystemd-networkd-core.la @@ -5280,7 +5231,6 @@ libsystemd_logind_core_la_SOURCES = \ libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -5389,7 +5339,6 @@ pam_systemd_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym pam_systemd_la_LIBADD = \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(PAM_LIBS)