X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=3598edd262bdd400d57b5fc2abb81b8e61c6d2a8;hb=76037baee04c262f5d02a9c43ec9110c82196f36;hp=06d4fcf233951bc12013e592c101d11cd87bd321;hpb=780896a4f1ec7e36c8f72c866ba9693d790f9741;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 06d4fcf23..3598edd26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -665,6 +665,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/linux/seccomp-bpf.h \ src/shared/ioprio.h \ src/shared/missing.h \ + src/shared/initreq.h \ + src/shared/securebits.h \ + src/shared/special.h \ src/shared/list.h \ src/shared/macro.h \ src/shared/def.h \ @@ -764,11 +767,17 @@ libsystemd_shared_la_SOURCES = \ src/shared/net-util.c \ src/shared/net-util.h \ src/shared/errno-list.c \ - src/shared/errno-list.h + src/shared/errno-list.h \ + src/shared/syscall-list.c \ + src/shared/syscall-list.h \ + src/shared/audit.c \ + src/shared/audit.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ - src/shared/errno-to-name.h + src/shared/errno-to-name.h \ + src/shared/syscall-from-name.h \ + src/shared/syscall-to-name.h # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -835,14 +844,6 @@ libsystemd_capability_la_CFLAGS = \ libsystemd_capability_la_LIBADD = \ $(CAP_LIBS) -# ------------------------------------------------------------------------------ -noinst_LTLIBRARIES += \ - libsystemd-audit.la - -libsystemd_audit_la_SOURCES = \ - src/shared/audit.c \ - src/shared/audit.h - # ------------------------------------------------------------------------------ if HAVE_ACL noinst_LTLIBRARIES += \ @@ -973,17 +974,12 @@ libsystemd_core_la_SOURCES = \ src/core/namespace.h \ src/core/tcpwrap.c \ src/core/tcpwrap.h \ - src/core/securebits.h \ - src/core/initreq.h \ - src/core/special.h \ src/core/build.h \ src/core/sysfs-show.h \ src/core/switch-root.h \ src/core/switch-root.c \ src/core/killall.h \ src/core/killall.c \ - src/core/syscall-list.c \ - src/core/syscall-list.h \ src/core/audit-fd.c \ src/core/audit-fd.h \ src/core/async.c \ @@ -997,9 +993,7 @@ endif nodist_libsystemd_core_la_SOURCES = \ src/core/load-fragment-gperf.c \ - src/core/load-fragment-gperf-nulstr.c \ - src/core/syscall-from-name.h \ - src/core/syscall-to-name.h + src/core/load-fragment-gperf-nulstr.c libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1013,7 +1007,6 @@ libsystemd_core_la_LIBADD = \ libsystemd-capability.la \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-audit.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libudev-internal.la \ @@ -1037,30 +1030,30 @@ CLEANFILES += \ src/core/load-fragment-gperf.gperf \ src/core/load-fragment-gperf.c \ src/core/load-fragment-gperf-nulstr.c \ - src/core/syscall-list.txt \ - src/core/syscall-from-name.gperf \ + src/shared/syscall-list.txt \ + src/shared/syscall-from-name.gperf \ src/shared/errno-list.txt \ src/shared/errno-from-name.gperf BUILT_SOURCES += \ - src/core/syscall-from-name.h \ - src/core/syscall-to-name.h \ + src/shared/syscall-from-name.h \ + src/shared/syscall-to-name.h \ src/shared/errno-from-name.h \ src/shared/errno-to-name.h -src/core/syscall-list.txt: Makefile +src/shared/syscall-list.txt: Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); if ($$2 !~ /SYSCALL_BASE/) print $$2; }' > $@ -src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile +src/shared/syscall-from-name.gperf: src/shared/syscall-list.txt Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@ -src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile +src/shared/syscall-from-name.h: src/shared/syscall-from-name.gperf Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@ -src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile +src/shared/syscall-to-name.h: src/shared/syscall-list.txt Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ @@ -1161,7 +1154,10 @@ EXTRA_DIST += \ test/sched_idle_ok.service \ test/sched_rr_bad.service \ test/sched_rr_ok.service \ - test/sched_rr_change.service + test/sched_rr_change.service \ + test/son.service \ + test/daughter.service \ + test/parent.slice EXTRA_DIST += \ src/test/test-helper.h @@ -1954,6 +1950,8 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-container.h \ src/libsystemd-bus/bus-message.c \ src/libsystemd-bus/bus-message.h \ + src/libsystemd-bus/bus-creds.c \ + src/libsystemd-bus/bus-creds.h \ src/libsystemd-bus/bus-signature.c \ src/libsystemd-bus/bus-signature.h \ src/libsystemd-bus/bus-type.c \ @@ -2032,6 +2030,7 @@ tests += \ test-bus-introspect \ test-bus-objects \ test-bus-error \ + test-bus-creds \ test-event bin_PROGRAMS += \ @@ -2116,6 +2115,17 @@ test_bus_error_LDADD = \ libsystemd-daemon-internal.la \ libsystemd-shared.la +test_bus_creds_SOURCES = \ + src/libsystemd-bus/test-bus-creds.c + +test_bus_creds_LDADD = \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la \ + libsystemd-bus-dump.la \ + libsystemd-capability.la + test_bus_match_SOURCES = \ src/libsystemd-bus/test-bus-match.c @@ -2958,6 +2968,12 @@ test_journal_stream_SOURCES = \ test_journal_stream_LDADD = \ libsystemd-journal-core.la +test_journal_flush_SOURCES = \ + src/journal/test-journal-flush.c + +test_journal_flush_LDADD = \ + libsystemd-journal-core.la + test_journal_init_SOURCES = \ src/journal/test-journal-init.c @@ -3077,7 +3093,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \ libsystemd_journal_core_la_LIBADD = \ libsystemd-journal-internal.la \ libudev-internal.la \ - libsystemd-audit.la \ libsystemd-capability.la \ libsystemd-label.la \ libsystemd-daemon-internal.la \ @@ -3164,6 +3179,7 @@ tests += \ test-journal-init \ test-journal-verify \ test-journal-interleaving \ + test-journal-flush \ test-mmap-cache \ test-catalog @@ -3202,6 +3218,7 @@ pkgconfiglib_DATA += \ dist_catalog_DATA = \ catalog/systemd-fr.catalog \ + catalog/systemd-ru.catalog \ catalog/systemd.catalog SOCKETS_TARGET_WANTS += \ @@ -3767,7 +3784,6 @@ libsystemd_machine_core_la_SOURCES = \ libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ - libsystemd-audit.la \ libsystemd-daemon-internal.la \ libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ @@ -3830,6 +3846,7 @@ systemd_networkd_SOURCES = \ src/network/networkd.h \ src/network/networkd.c \ src/network/networkd-link.c \ + src/network/networkd-bridge.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ @@ -3840,6 +3857,7 @@ nodist_systemd_networkd_SOURCES = \ systemd_networkd_LDADD = \ libudev-internal.la \ + libsystemd-daemon-internal.la \ libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ libsystemd-rtnl.la \ @@ -3855,6 +3873,7 @@ test_network_SOURCES = \ src/network/test-network.c \ src/network/networkd.h \ src/network/networkd-link.c \ + src/network/networkd-bridge.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ @@ -3919,7 +3938,6 @@ libsystemd_logind_core_la_SOURCES = \ libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-capability.la \ - libsystemd-audit.la \ libsystemd-daemon-internal.la \ libsystemd-id128-internal.la \ libsystemd-bus-internal.la \ @@ -4059,7 +4077,6 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-capability.la \ - libsystemd-audit.la \ libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ @@ -4124,6 +4141,8 @@ MULTI_USER_TARGET_WANTS += \ SYSTEM_UNIT_ALIASES += \ systemd-logind.service dbus-org.freedesktop.login1.service +if ENABLE_MULTI_SEAT_X + systemd_multi_seat_x_SOURCES = \ src/login/multi-seat-x.c @@ -4134,6 +4153,8 @@ systemd_multi_seat_x_LDADD = \ rootlibexec_PROGRAMS += \ systemd-multi-seat-x +endif + dist_udevrules_DATA += \ src/login/70-uaccess.rules \ src/login/70-power-switch.rules