X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=dcf0bb3bb3fa120799d20b65c740b512e7340502;hp=a7baea51cdc1a619e5248b366ad9649eecd7b2c2;hb=294c866023d05162880b056fea5242d25cd9e865;hpb=917c03718c98a24dfd2ec089fddd9bec0d307c7d diff --git a/Makefile.am b/Makefile.am index a7baea51c..dcf0bb3bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -219,6 +219,7 @@ LOCAL_FS_TARGET_WANTS = MULTI_USER_TARGET_WANTS = SYSINIT_TARGET_WANTS = SOCKETS_TARGET_WANTS = +BUSNAMES_TARGET_WANTS = TIMERS_TARGET_WANTS = SYSTEM_UNIT_ALIASES = @@ -237,6 +238,7 @@ install-target-wants-hook: 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) @@ -393,6 +395,7 @@ dist_systemunit_DATA = \ units/sigpwr.target \ units/sleep.target \ units/sockets.target \ + units/busnames.target \ units/timers.target \ units/paths.target \ units/suspend.target \ @@ -649,10 +652,12 @@ test_rtnl_SOURCES = \ test_rtnl_LDADD = \ libsystemd-rtnl.la \ libsystemd-bus-internal.la \ + libsystemd-daemon-internal.la \ libsystemd-id128-internal.la \ libsystemd-shared.la -tests += test-rtnl +tests += \ + test-rtnl # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -793,9 +798,6 @@ libsystemd_units_la_SOURCES = \ src/shared/specifier.c \ src/shared/specifier.h -libsystemd_units_la_CFLAGS = \ - $(AM_CFLAGS) - # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-label.la @@ -880,20 +882,22 @@ libsystemd_core_la_SOURCES = \ src/core/load-fragment.h \ src/core/service.c \ src/core/service.h \ - src/core/automount.c \ - src/core/automount.h \ - src/core/mount.c \ - src/core/mount.h \ - src/core/swap.c \ - src/core/swap.h \ - src/core/device.c \ - src/core/device.h \ + src/core/socket.c \ + src/core/socket.h \ + src/core/busname.c \ + src/core/busname.h \ src/core/target.c \ src/core/target.h \ src/core/snapshot.c \ src/core/snapshot.h \ - src/core/socket.c \ - src/core/socket.h \ + src/core/device.c \ + src/core/device.h \ + src/core/mount.c \ + src/core/mount.h \ + src/core/automount.c \ + src/core/automount.h \ + src/core/swap.c \ + src/core/swap.h \ src/core/timer.c \ src/core/timer.h \ src/core/path.c \ @@ -920,20 +924,22 @@ libsystemd_core_la_SOURCES = \ src/core/dbus-service.h \ src/core/dbus-socket.c \ src/core/dbus-socket.h \ - src/core/dbus-timer.c \ - src/core/dbus-timer.h \ + src/core/dbus-busname.c \ + src/core/dbus-busname.h \ src/core/dbus-target.c \ src/core/dbus-target.h \ + src/core/dbus-snapshot.c \ + src/core/dbus-snapshot.h \ + src/core/dbus-device.c \ + src/core/dbus-device.h \ src/core/dbus-mount.c \ src/core/dbus-mount.h \ src/core/dbus-automount.c \ src/core/dbus-automount.h \ src/core/dbus-swap.c \ src/core/dbus-swap.h \ - src/core/dbus-snapshot.c \ - src/core/dbus-snapshot.h \ - src/core/dbus-device.c \ - src/core/dbus-device.h \ + src/core/dbus-timer.c \ + src/core/dbus-timer.h \ src/core/dbus-path.c \ src/core/dbus-path.h \ src/core/dbus-slice.c \ @@ -1342,10 +1348,9 @@ test_cgroup_LDADD = \ test_cgroup_mask_SOURCES = \ src/test/test-cgroup-mask.c -test_cgroup_mask_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)" +test_cgroup_mask_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DTEST_DIR=\"$(abs_top_srcdir)/test\" test_cgroup_mask_LDADD = \ libsystemd-core.la \ @@ -1409,9 +1414,9 @@ test_watchdog_LDADD = \ test_sched_prio_SOURCES = \ src/test/test-sched-prio.c -test_sched_prio_CFLAGS = \ - $(AM_CFLAGS) \ - -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)" +test_sched_prio_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DTEST_DIR=\"$(abs_top_srcdir)/test\" test_sched_prio_LDADD = \ libsystemd-core.la \ @@ -1555,11 +1560,10 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ if ENABLE_TMPFILES systemd_tmpfiles_SOURCES = \ - src/tmpfiles/tmpfiles.c \ - src/shared/specifier.c \ - src/shared/specifier.h + src/tmpfiles/tmpfiles.c systemd_tmpfiles_LDADD = \ + libsystemd-units.la \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-id128-internal.la \ @@ -1748,6 +1752,18 @@ systemd_gpt_auto_generator_CFLAGS = \ $(BLKID_CFLAGS) endif +# ------------------------------------------------------------------------------ +systemgenerator_PROGRAMS += \ + systemd-dbus1-generator + +systemd_dbus1_generator_SOURCES = \ + src/dbus1-generator/dbus1-generator.c + +systemd_dbus1_generator_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la \ + libsystemd-bus-internal.la + # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ src/rc-local-generator/rc-local-generator.c @@ -1784,8 +1800,14 @@ systemctl_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ libsystemd-bus-internal.la \ - libsystemd-logs.la \ - libsystemd-login-internal.la \ + libsystemd-logs.la + +if ENABLE_LOGIND +systemctl_LDADD += \ + libsystemd-login-internal.la +endif + +systemctl_LDADD += \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ @@ -1876,6 +1898,22 @@ bus-proxyd-uninstall-hook: INSTALL_EXEC_HOOKS += bus-proxyd-install-hook UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook + +nodist_systemunit_DATA += \ + units/systemd-bus-proxyd@.service + +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 + +EXTRA_DIST += \ + units/systemd-bus-proxyd@.service.in + # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ src/tty-ask-password-agent/tty-ask-password-agent.c @@ -1972,6 +2010,8 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-introspect.h \ src/libsystemd-bus/bus-objects.c \ src/libsystemd-bus/bus-objects.h \ + src/libsystemd-bus/bus-gvariant.c \ + src/libsystemd-bus/bus-gvariant.h \ src/libsystemd-bus/bus-convenience.c \ src/libsystemd-bus/kdbus.h \ src/libsystemd-bus/sd-memfd.c \ @@ -1979,7 +2019,8 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-util.h \ src/libsystemd-bus/sd-utf8.c \ src/libsystemd-bus/sd-event.c \ - src/libsystemd-bus/event-util.h + src/libsystemd-bus/event-util.h \ + src/libsystemd-bus/bus-protocol.h libsystemd_bus_la_LIBADD = \ libsystemd-id128-internal.la \ @@ -1999,7 +2040,9 @@ pkgconfiglib_DATA += \ src/libsystemd-bus/libsystemd-bus.pc EXTRA_DIST += \ - src/libsystemd-bus/libsystemd-bus.pc.in + src/libsystemd-bus/libsystemd-bus.pc.in \ + src/libsystemd-bus/DIFFERENCES \ + src/libsystemd-bus/GVARIANT-SERIALIZATION lib_LTLIBRARIES += \ libsystemd-bus.la @@ -2018,7 +2061,7 @@ libsystemd_bus_dump_la_SOURCES = \ src/libsystemd-bus/bus-dump.h libsystemd_bus_dump_la_CFLAGS = \ - $(AM_CFLAGS) + $(AM_CFLAGS) \ $(CAP_CFLAGS) noinst_LTLIBRARIES += \ @@ -2039,6 +2082,7 @@ tests += \ test-bus-objects \ test-bus-error \ test-bus-creds \ + test-bus-gvariant \ test-event bin_PROGRAMS += \ @@ -2123,6 +2167,24 @@ test_bus_error_LDADD = \ libsystemd-daemon-internal.la \ libsystemd-shared.la +test_bus_gvariant_SOURCES = \ + src/libsystemd-bus/test-bus-gvariant.c + +test_bus_gvariant_LDADD = \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la \ + libsystemd-bus-dump.la \ + libsystemd-capability.la \ + $(GLIB_LIBS) \ + $(CAP_LIBS) + +test_bus_gvariant_CFLAGS = \ + $(AM_CFLAGS) \ + $(GLIB_CFLAGS) + $(CAP_CFLAGS) + test_bus_creds_SOURCES = \ src/libsystemd-bus/test-bus-creds.c @@ -2902,7 +2964,9 @@ systemd_journald_SOURCES = \ src/journal/journald-server.h systemd_journald_LDADD = \ - libsystemd-journal-core.la + libsystemd-journal-core.la \ + libsystemd-bus-internal.la \ + libsystemd-shared.la systemd_cat_SOURCES = \ src/journal/cat.c @@ -3009,8 +3073,8 @@ test_mmap_cache_LDADD = \ test_catalog_SOURCES = \ src/journal/test-catalog.c -test_catalog_CFLAGS = \ - $(AM_CFLAGS) \ +test_catalog_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\" test_catalog_LDADD = \ @@ -3225,9 +3289,9 @@ pkgconfiglib_DATA += \ src/journal/libsystemd-journal.pc dist_catalog_DATA = \ - catalog/systemd-fr.catalog \ - catalog/systemd-ru.catalog \ - catalog/systemd-it.catalog \ + catalog/systemd.fr.catalog \ + catalog/systemd.ru.catalog \ + catalog/systemd.it.catalog \ catalog/systemd.catalog SOCKETS_TARGET_WANTS += \ @@ -3268,9 +3332,12 @@ systemd_journal_gatewayd_LDADD = \ systemd_journal_gatewayd_CFLAGS = \ $(AM_CFLAGS) \ - -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \ $(MICROHTTPD_CFLAGS) +systemd_journal_gatewayd_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" + dist_systemunit_DATA += \ units/systemd-journal-gatewayd.socket @@ -3592,6 +3659,9 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-hostnamed.service +dist_systemunit_DATA += \ + units/org.freedesktop.hostname1.busname + dist_dbuspolicy_DATA += \ src/hostname/org.freedesktop.hostname1.conf @@ -3604,6 +3674,9 @@ polkitpolicy_files += \ SYSTEM_UNIT_ALIASES += \ systemd-hostnamed.service dbus-org.freedesktop.hostname1.service +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.hostname1.busname + hostnamectl_SOURCES = \ src/hostname/hostnamectl.c @@ -3624,6 +3697,20 @@ dist_zshcompletion_DATA += \ endif +if ENABLE_BUS_DRIVERD +systemd_bus_driverd_SOURCES = \ + src/bus-driverd/bus-driverd.c + +systemd_bus_driverd_LDADD = \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la + +rootlibexec_PROGRAMS += \ + systemd-bus-driverd +endif + polkitpolicy_in_files += \ src/hostname/org.freedesktop.hostname1.policy.in @@ -3645,6 +3732,9 @@ systemd_localed_LDADD = \ nodist_systemunit_DATA += \ units/systemd-localed.service +dist_systemunit_DATA += \ + units/org.freedesktop.locale1.busname + rootlibexec_PROGRAMS += \ systemd-localed @@ -3660,6 +3750,9 @@ polkitpolicy_files += \ SYSTEM_UNIT_ALIASES += \ systemd-localed.service dbus-org.freedesktop.locale1.service +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.locale1.busname + dist_pkgdata_DATA += \ src/locale/kbd-model-map @@ -3719,6 +3812,9 @@ dist_dbuspolicy_DATA += \ nodist_systemunit_DATA += \ units/systemd-timedated.service +dist_systemunit_DATA += \ + units/org.freedesktop.timedate1.busname + polkitpolicy_files += \ src/timedate/org.freedesktop.timedate1.policy @@ -3729,6 +3825,9 @@ INSTALL_DIRS += \ SYSTEM_UNIT_ALIASES += \ systemd-timedated.service dbus-org.freedesktop.timedate1.service +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.timedate1.busname + timedatectl_SOURCES = \ src/timedate/timedatectl.c @@ -3773,6 +3872,46 @@ lib_LTLIBRARIES += \ libnss_myhostname.la endif +# ------------------------------------------------------------------------------ +libsystemd_dhcp_la_SOURCES = \ + src/systemd/sd-dhcp-client.h \ + src/libsystemd-dhcp/dhcp-protocol.h \ + src/libsystemd-dhcp/dhcp-internal.h \ + src/libsystemd-dhcp/dhcp-network.c \ + src/libsystemd-dhcp/dhcp-option.c \ + src/libsystemd-dhcp/dhcp-client.c + +noinst_LTLIBRARIES += \ + libsystemd-dhcp.la + +libsystemd_dhcp_la_LIBADD = \ + libsystemd-shared.la \ + libsystemd-bus.la + +test_dhcp_option_SOURCES = \ + src/libsystemd-dhcp/dhcp-protocol.h \ + src/libsystemd-dhcp/dhcp-internal.h \ + src/libsystemd-dhcp/test-dhcp-option.c + +test_dhcp_option_LDADD = \ + libsystemd-dhcp.la \ + libsystemd-shared.la + +test_dhcp_client_SOURCES = \ + src/libsystemd-dhcp/dhcp-protocol.h \ + src/systemd/sd-dhcp-client.h \ + src/libsystemd-dhcp/dhcp-internal.h \ + src/libsystemd-dhcp/test-dhcp-client.c + +test_dhcp_client_LDADD = \ + libsystemd-dhcp.la \ + libsystemd-shared.la \ + libsystemd-bus.la + +tests += \ + test-dhcp-option \ + test-dhcp-client + # ------------------------------------------------------------------------------ if ENABLE_MACHINED systemd_machined_SOURCES = \ @@ -3827,7 +3966,8 @@ nodist_systemunit_DATA += \ units/systemd-machined.service dist_systemunit_DATA += \ - units/machine.slice + units/machine.slice \ + units/org.freedesktop.machine1.busname dist_dbussystemservice_DATA += \ src/machine/org.freedesktop.machine1.service @@ -3841,6 +3981,9 @@ dist_zshcompletion_DATA += \ SYSTEM_UNIT_ALIASES += \ systemd-machined.service dbus-org.freedesktop.machine1.service +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.machine1.busname + EXTRA_DIST += \ units/systemd-machined.service.in @@ -3893,10 +4036,12 @@ test_network_LDADD = \ libudev-internal.la \ libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ libsystemd-rtnl.la \ libsystemd-shared.la -tests += test-network +tests += \ + test-network EXTRA_DIST += \ src/network/networkd-gperf.gperf \ @@ -4114,7 +4259,8 @@ nodist_systemunit_DATA += \ units/systemd-user-sessions.service dist_systemunit_DATA += \ - units/user.slice + units/user.slice \ + units/org.freedesktop.login1.busname dist_dbussystemservice_DATA += \ src/login/org.freedesktop.login1.service @@ -4150,6 +4296,9 @@ MULTI_USER_TARGET_WANTS += \ SYSTEM_UNIT_ALIASES += \ systemd-logind.service dbus-org.freedesktop.login1.service +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.login1.busname + if ENABLE_MULTI_SEAT_X systemd_multi_seat_x_SOURCES = \ @@ -4585,6 +4734,7 @@ SYSTEM_UNIT_ALIASES += \ USER_UNIT_ALIASES += \ $(systemunitdir)/shutdown.target shutdown.target \ $(systemunitdir)/sockets.target sockets.target \ + $(systemunitdir)/busnames.target busnames.target \ $(systemunitdir)/timers.target timers.target \ $(systemunitdir)/paths.target paths.target \ $(systemunitdir)/bluetooth.target bluetooth.target \ @@ -4651,7 +4801,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ --with-rootprefix=$$dc_install_base \ - --disable-split-usr + --disable-split-usr \ + --enable-kdbus if HAVE_SYSV_COMPAT DISTCHECK_CONFIGURE_FLAGS += \ @@ -4829,3 +4980,6 @@ tests += \ test-libsystemd-journal-sym \ test-libsystemd-login-sym \ test-libudev-sym + +cppcheck: + cppcheck --enable=all $(top_srcdir)