X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7a159429e86e51c962c51e684374b5a5497fad5a;hp=dcf0bb3bb3fa120799d20b65c740b512e7340502;hb=71365a7754db5ff8e07941501063b1da2a4b4bd5;hpb=294c866023d05162880b056fea5242d25cd9e865 diff --git a/Makefile.am b/Makefile.am index dcf0bb3bb..7a159429e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -221,6 +221,8 @@ SYSINIT_TARGET_WANTS = SOCKETS_TARGET_WANTS = BUSNAMES_TARGET_WANTS = TIMERS_TARGET_WANTS = +USER_SOCKETS_TARGET_WANTS = +USER_BUSNAMES_TARGET_WANTS = SYSTEM_UNIT_ALIASES = USER_UNIT_ALIASES = @@ -228,23 +230,25 @@ USER_UNIT_ALIASES = GENERAL_ALIASES = install-target-wants-hook: - what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && $(add-wants) - what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && $(add-wants) - what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && $(add-wants) - what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && $(add-wants) - what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && $(add-wants) - what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && $(add-wants) - what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants) - what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants) - what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants) - what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants) - what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && $(add-wants) - what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants) - what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants) + what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && dir=$(systemunitdir) && $(add-wants) + what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && dir=$(systemunitdir) && $(add-wants) + what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && dir=$(systemunitdir) && $(add-wants) + what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && dir=$(systemunitdir) && $(add-wants) + what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && dir=$(systemunitdir) && $(add-wants) + what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants) + what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants) + what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants) + what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants) + what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants) + what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants) + what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants) + what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants) + what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants) + what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants) define add-wants [ -z "$$what" ] || ( \ - dir=$(DESTDIR)$(systemunitdir)/$$wants.wants && \ + dir=$(DESTDIR)$$dir/$$wants.wants && \ $(MKDIR_P) -m 0755 $$dir && \ cd $$dir && \ rm -f $$what && \ @@ -460,6 +464,7 @@ nodist_systemunit_DATA = \ units/systemd-nspawn@.service dist_userunit_DATA = \ + units/user/basic.target \ units/user/default.target \ units/user/exit.target @@ -489,7 +494,7 @@ EXTRA_DIST += \ units/user/systemd-exit.service.in \ units/systemd-fsck@.service.in \ units/systemd-fsck-root.service.in \ - units/user@.service.in \ + units/user@.service.m4.in \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ @@ -508,7 +513,8 @@ CLEANFILES += \ units/console-shell.service.m4 \ units/console-getty.service.m4 \ units/container-getty@.service.m4 \ - units/rescue.service.m4 + units/rescue.service.m4 \ + units/user@.service.m4 if HAVE_SYSV_COMPAT nodist_systemunit_DATA += \ @@ -694,6 +700,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/time-util.h \ src/shared/hashmap.c \ src/shared/hashmap.h \ + src/shared/siphash24.c \ + src/shared/siphash24.h \ src/shared/set.c \ src/shared/set.h \ src/shared/fdset.c \ @@ -753,8 +761,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/fileio.c \ src/shared/fileio.h \ src/shared/output-mode.h \ - src/shared/MurmurHash3.c \ - src/shared/MurmurHash3.h \ + src/shared/MurmurHash2.c \ + src/shared/MurmurHash2.h \ src/shared/acpi-fpdt.h \ src/shared/acpi-fpdt.c \ src/shared/boot-timestamps.h \ @@ -776,7 +784,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/syscall-list.c \ src/shared/syscall-list.h \ src/shared/audit.c \ - src/shared/audit.h + src/shared/audit.h \ + src/shared/xml.c \ + src/shared/xml.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -1153,7 +1163,8 @@ tests += \ test-hashmap \ test-list \ test-tables \ - test-device-nodes + test-device-nodes \ + test-xml EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1255,6 +1266,12 @@ test_hashmap_SOURCES = \ test_hashmap_LDADD = \ libsystemd-core.la +test_xml_SOURCES = \ + src/test/test-xml.c + +test_xml_LDADD = \ + libsystemd-shared.la + test_list_SOURCES = \ src/test/test-list.c @@ -1582,6 +1599,7 @@ nodist_systemunit_DATA += \ dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ + tmpfiles.d/systemd-nologin.conf \ tmpfiles.d/tmp.conf \ tmpfiles.d/x11.conf @@ -1891,7 +1909,7 @@ systemd_bus_proxyd_LDADD = \ libsystemd-shared.la bus-proxyd-install-hook: - $(AM_V_LN)$(LN_S) -f ../../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge + $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge bus-proxyd-uninstall-hook: rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge @@ -1899,6 +1917,7 @@ bus-proxyd-uninstall-hook: INSTALL_EXEC_HOOKS += bus-proxyd-install-hook UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook +if ENABLE_KDBUS nodist_systemunit_DATA += \ units/systemd-bus-proxyd@.service @@ -1906,10 +1925,9 @@ dist_systemunit_DATA += \ units/systemd-bus-proxyd.socket dist_userunit_DATA += \ - units/user/systemd-bus-proxyd.socket - -USER_UNIT_ALIASES += \ - $(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service + units/user/systemd-bus-proxyd.socket \ + units/user/systemd-bus-proxyd@.service +endif EXTRA_DIST += \ units/systemd-bus-proxyd@.service.in @@ -2022,6 +2040,9 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/event-util.h \ src/libsystemd-bus/bus-protocol.h +nodist_libsystemd_bus_la_SOURCES = \ + src/libsystemd-bus/bus-error-mapping.c + libsystemd_bus_la_LIBADD = \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ @@ -2040,16 +2061,23 @@ pkgconfiglib_DATA += \ src/libsystemd-bus/libsystemd-bus.pc EXTRA_DIST += \ + src/libsystemd-bus/bus-error-mapping.gperf \ src/libsystemd-bus/libsystemd-bus.pc.in \ src/libsystemd-bus/DIFFERENCES \ src/libsystemd-bus/GVARIANT-SERIALIZATION +CLEANFILES += \ + src/libsystemd-bus/bus-error-mapping.c + lib_LTLIBRARIES += \ libsystemd-bus.la libsystemd_bus_internal_la_SOURCES = \ $(libsystemd_bus_la_SOURCES) +nodist_libsystemd_bus_internal_la_SOURCES = \ + $(nodist_libsystemd_bus_la_SOURCES) + libsystemd_bus_internal_la_CFLAGS = \ $(libsystemd_bus_la_CFLAGS) @@ -2410,6 +2438,8 @@ dist_udevhwdb_DATA = \ hwdb/20-pci-classes.hwdb \ hwdb/20-usb-vendor-model.hwdb \ hwdb/20-usb-classes.hwdb \ + hwdb/20-sdio-vendor-model.hwdb \ + hwdb/20-sdio-classes.hwdb \ hwdb/20-bluetooth-vendor-product.hwdb \ hwdb/20-acpi-vendor.hwdb \ hwdb/20-OUI.hwdb \ @@ -3697,7 +3727,14 @@ dist_zshcompletion_DATA += \ endif -if ENABLE_BUS_DRIVERD +polkitpolicy_in_files += \ + src/hostname/org.freedesktop.hostname1.policy.in + +EXTRA_DIST += \ + units/systemd-hostnamed.service.in + +# ------------------------------------------------------------------------------ +if ENABLE_KDBUS systemd_bus_driverd_SOURCES = \ src/bus-driverd/bus-driverd.c @@ -3709,13 +3746,28 @@ systemd_bus_driverd_LDADD = \ rootlibexec_PROGRAMS += \ systemd-bus-driverd -endif -polkitpolicy_in_files += \ - src/hostname/org.freedesktop.hostname1.policy.in +nodist_systemunit_DATA += \ + units/systemd-bus-driverd.service + +dist_systemunit_DATA += \ + units/org.freedesktop.DBus.busname + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.DBus.busname + +nodist_userunit_DATA += \ + units/user/systemd-bus-driverd.service + +USER_BUSNAMES_TARGET_WANTS += \ + org.freedesktop.DBus.busname + +USER_UNIT_ALIASES += \ + $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname +endif EXTRA_DIST += \ - units/systemd-hostnamed.service.in + units/systemd-bus-driverd.service.in # ------------------------------------------------------------------------------ if ENABLE_LOCALED @@ -3885,8 +3937,8 @@ noinst_LTLIBRARIES += \ libsystemd-dhcp.la libsystemd_dhcp_la_LIBADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-shared.la test_dhcp_option_SOURCES = \ src/libsystemd-dhcp/dhcp-protocol.h \ @@ -3904,9 +3956,11 @@ test_dhcp_client_SOURCES = \ src/libsystemd-dhcp/test-dhcp-client.c test_dhcp_client_LDADD = \ + libsystemd-bus-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-id128-internal.la \ libsystemd-dhcp.la \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-shared.la tests += \ test-dhcp-option \ @@ -4013,6 +4067,7 @@ systemd_networkd_LDADD = \ libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ libsystemd-rtnl.la \ + libsystemd-dhcp.la \ libsystemd-shared.la nodist_systemunit_DATA += \ @@ -4038,6 +4093,7 @@ test_network_LDADD = \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-rtnl.la \ + libsystemd-dhcp.la \ libsystemd-shared.la tests += \ @@ -4581,11 +4637,11 @@ src/%: src/%.m4 $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ units/%: units/%.m4 - $(AM_V_M4)$(MKDIR_P) $(dir $@) + $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ units/user/%: units/%.m4 - $(AM_V_M4)$(MKDIR_P) $(dir $@) + $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ if ENABLE_POLKIT @@ -4857,8 +4913,11 @@ install-tree: all # exclude the one perl script we have in there valgrind-tests: $(TESTS) $(AM_V_GEN)for f in $(filter-out %.pl, $^); do \ - echo "Running $$f"; \ - libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; \ + if file $$f | grep -q shell; then \ + echo -e "$${x}Skipping non-binary $$f"; else \ + echo -e "$${x}Running $$f"; \ + libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; fi; \ + x="\n\n"; \ done exported-%: % @@ -4982,4 +5041,4 @@ tests += \ test-libudev-sym cppcheck: - cppcheck --enable=all $(top_srcdir) + cppcheck --enable=all -q $(top_srcdir)