X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=ce5ff6392d479fe8828bac72e8867c1b9b5ffd6f;hp=6ce4b7fffa4e52dfb35a4a47891a4b998e247ee0;hb=faaa5728d956b7f0d24f27f3341d0b9fff30af00;hpb=65f568bbeb9b8c70200e44c19a797df3a0bfd485 diff --git a/Makefile.am b/Makefile.am index 6ce4b7fff..ce5ff6392 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,14 @@ LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=3 LIBSYSTEMD_JOURNAL_AGE=11 +LIBSYSTEMD_BUS_CURRENT=0 +LIBSYSTEMD_BUS_REVISION=0 +LIBSYSTEMD_BUS_AGE=0 + +LIBSYSTEMD_EVENT_CURRENT=0 +LIBSYSTEMD_EVENT_REVISION=0 +LIBSYSTEMD_EVENT_AGE=0 + # Dirs of external packages dbuspolicydir=@dbuspolicydir@ dbussessionservicedir=@dbussessionservicedir@ @@ -83,7 +91,7 @@ userunitdir=$(prefix)/lib/systemd/user userpresetdir=$(prefix)/lib/systemd/user-preset tmpfilesdir=$(prefix)/lib/tmpfiles.d sysctldir=$(prefix)/lib/sysctl.d -linkdir=$(prefix)/lib/net/links +networkdir=$(prefix)/lib/systemd/network pkgincludedir=$(includedir)/systemd systemgeneratordir=$(rootlibexecdir)/system-generators usergeneratordir=$(prefix)/lib/systemd/user-generators @@ -183,6 +191,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/udev/net \ -I $(top_builddir)/src/udev \ -I $(top_srcdir)/src/libsystemd-bus \ + -I $(top_srcdir)/src/libsystemd-rtnl \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) @@ -343,6 +352,7 @@ dist_zshcompletion_DATA = \ shell-completion/zsh/_kernel-install \ shell-completion/zsh/_systemd-nspawn \ shell-completion/zsh/_systemd-analyze \ + shell-completion/zsh/_systemd-run \ shell-completion/zsh/_sd_hosts_or_user_at_host \ shell-completion/zsh/_systemd-delta \ shell-completion/zsh/_systemd @@ -416,6 +426,7 @@ nodist_systemunit_DATA = \ units/serial-getty@.service \ units/console-shell.service \ units/console-getty.service \ + units/container-getty@.service \ units/systemd-initctl.service \ units/systemd-shutdownd.service \ units/systemd-remount-fs.service \ @@ -458,6 +469,7 @@ EXTRA_DIST += \ units/serial-getty@.service.m4 \ units/console-shell.service.m4.in \ units/console-getty.service.m4.in \ + units/container-getty@.service.m4.in \ units/rescue.service.m4.in \ units/systemd-initctl.service.in \ units/systemd-shutdownd.service.in \ @@ -493,6 +505,7 @@ EXTRA_DIST += \ CLEANFILES += \ units/console-shell.service.m4 \ units/console-getty.service.m4 \ + units/container-getty@.service.m4 \ units/rescue.service.m4 if HAVE_SYSV_COMPAT @@ -627,7 +640,9 @@ libsystemd_rtnl_la_SOURCES = \ src/systemd/sd-rtnl.h \ src/libsystemd-rtnl/sd-rtnl.c \ src/libsystemd-rtnl/rtnl-internal.h \ - src/libsystemd-rtnl/rtnl-message.c + src/libsystemd-rtnl/rtnl-message.c \ + src/libsystemd-rtnl/rtnl-util.h \ + src/libsystemd-rtnl/rtnl-util.c test_rtnl_SOURCES = \ src/libsystemd-rtnl/test-rtnl.c @@ -741,7 +756,11 @@ libsystemd_shared_la_SOURCES = \ src/shared/apparmor-util.c \ src/shared/apparmor-util.h \ src/shared/ima-util.c \ - src/shared/ima-util.h + src/shared/ima-util.h \ + src/shared/ptyfwd.c \ + src/shared/ptyfwd.h \ + src/shared/net-util.c \ + src/shared/net-util.h #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ @@ -749,11 +768,7 @@ noinst_LTLIBRARIES += \ libsystemd_dbus_la_SOURCES = \ src/shared/dbus-common.c \ - src/shared/dbus-common.h \ - src/shared/dbus-loop.c \ - src/shared/dbus-loop.h \ - src/shared/polkit.c \ - src/shared/polkit.h + src/shared/dbus-common.h libsystemd_dbus_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1464,26 +1479,22 @@ endif systemd_analyze_SOURCES = \ src/analyze/analyze.c -systemd_analyze_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - systemd_analyze_LDADD = \ libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ src/initctl/initctl.c -systemd_initctl_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - systemd_initctl_LDADD = \ - libsystemd-shared.la \ - libsystemd-daemon.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_update_utmp_SOURCES = \ @@ -1491,12 +1502,13 @@ systemd_update_utmp_SOURCES = \ systemd_update_utmp_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ $(AUDIT_CFLAGS) systemd_update_utmp_LDADD = \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus.la \ $(AUDIT_LIBS) # ------------------------------------------------------------------------------ @@ -1644,13 +1656,11 @@ systemd_sleep_LDADD = \ systemd_fsck_SOURCES = \ src/fsck/fsck.c -systemd_fsck_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - systemd_fsck_LDADD = \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus.la \ libudev.la # ------------------------------------------------------------------------------ @@ -1778,8 +1788,10 @@ systemd_cgroups_agent_SOURCES = \ src/cgroups-agent/cgroups-agent.c systemd_cgroups_agent_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ systemctl_SOURCES = \ @@ -1846,10 +1858,10 @@ systemd_nspawn_SOURCES = \ systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ - libsystemd-shared.la \ - libsystemd-daemon.la \ + libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ - libsystemd-bus.la + libsystemd-shared.la \ + libsystemd-daemon.la # ------------------------------------------------------------------------------ systemd_run_SOURCES = \ @@ -1858,10 +1870,10 @@ systemd_run_SOURCES = \ systemd_run_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ + libsystemd-bus-internal.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-id128-internal.la \ - libsystemd-bus.la + libsystemd-id128-internal.la # ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ @@ -1927,12 +1939,32 @@ EXTRA_DIST += \ src/libsystemd-daemon/libsystemd-daemon.sym # ------------------------------------------------------------------------------ +libsystemd_event_la_SOURCES = \ + src/libsystemd-bus/sd-event.c \ + src/systemd/sd-event.h \ + src/libsystemd-bus/event-util.h + +libsystemd_event_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBSYSTEMD_EVENT_CURRENT):$(LIBSYSTEMD_EVENT_REVISION):$(LIBSYSTEMD_EVENT_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-event.sym + +EXTRA_DIST += \ + src/libsystemd-bus/libsystemd-event.sym + +lib_LTLIBRARIES += \ + libsystemd-event.la + +libsystemd_event_la_LIBADD = \ + libsystemd-id128-internal.la \ + libsystemd-shared.la + libsystemd_bus_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ src/systemd/sd-bus-vtable.h \ src/systemd/sd-memfd.h \ - src/systemd/sd-event.h \ + src/systemd/sd-utf8.h \ src/libsystemd-bus/sd-bus.c \ src/libsystemd-bus/bus-control.c \ src/libsystemd-bus/bus-control.h \ @@ -1944,6 +1976,8 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-socket.h \ src/libsystemd-bus/bus-kernel.c \ src/libsystemd-bus/bus-kernel.h \ + src/libsystemd-bus/bus-container.c \ + src/libsystemd-bus/bus-container.h \ src/libsystemd-bus/bus-message.c \ src/libsystemd-bus/bus-message.h \ src/libsystemd-bus/bus-signature.c \ @@ -1961,23 +1995,41 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-convenience.c \ src/libsystemd-bus/kdbus.h \ src/libsystemd-bus/sd-memfd.c \ - src/libsystemd-bus/sd-event.c \ src/libsystemd-bus/bus-util.c \ src/libsystemd-bus/bus-util.h \ - src/libsystemd-bus/event-util.h + src/libsystemd-bus/sd-utf8.c libsystemd_bus_la_LIBADD = \ libsystemd-id128-internal.la \ libsystemd-shared.la \ - libsystemd-daemon.la + libsystemd-daemon.la \ + libsystemd-event.la libsystemd_bus_la_CFLAGS = \ $(AM_CFLAGS) \ -pthread -noinst_LTLIBRARIES += \ +libsystemd_bus_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBSYSTEMD_BUS_CURRENT):$(LIBSYSTEMD_BUS_REVISION):$(LIBSYSTEMD_BUS_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-bus.sym + +EXTRA_DIST += \ + src/libsystemd-bus/libsystemd-bus.sym + +lib_LTLIBRARIES += \ libsystemd-bus.la +libsystemd_bus_internal_la_SOURCES = \ + $(libsystemd_bus_la_SOURCES) \ + $(libsystemd_event_la_SOURCES) + +libsystemd_bus_internal_la_CFLAGS = \ + $(libsystemd_bus_la_CFLAGS) + +noinst_LTLIBRARIES += \ + libsystemd-bus-internal.la + tests += \ test-bus-marshal \ test-bus-signature \ @@ -2000,8 +2052,10 @@ test_bus_marshal_SOURCES = \ src/libsystemd-bus/test-bus-marshal.c test_bus_marshal_LDADD = \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ libsystemd-shared.la \ - libsystemd-bus.la \ + libsystemd-daemon.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) @@ -2015,7 +2069,7 @@ test_bus_signature_SOURCES = \ test_bus_signature_LDADD = \ libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la test_bus_chat_SOURCES = \ src/libsystemd-bus/test-bus-chat.c @@ -2025,9 +2079,10 @@ test_bus_chat_CFLAGS = \ -pthread test_bus_chat_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_server_SOURCES = \ src/libsystemd-bus/test-bus-server.c @@ -2037,9 +2092,10 @@ test_bus_server_CFLAGS = \ -pthread test_bus_server_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_objects_SOURCES = \ src/libsystemd-bus/test-bus-objects.c @@ -2049,77 +2105,87 @@ test_bus_objects_CFLAGS = \ -pthread test_bus_objects_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_match_SOURCES = \ src/libsystemd-bus/test-bus-match.c test_bus_match_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_kernel_SOURCES = \ src/libsystemd-bus/test-bus-kernel.c test_bus_kernel_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_kernel_bloom_SOURCES = \ src/libsystemd-bus/test-bus-kernel-bloom.c test_bus_kernel_bloom_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_kernel_benchmark_SOURCES = \ src/libsystemd-bus/test-bus-kernel-benchmark.c test_bus_kernel_benchmark_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_memfd_SOURCES = \ src/libsystemd-bus/test-bus-memfd.c test_bus_memfd_LDADD = \ libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la test_bus_zero_copy_SOURCES = \ src/libsystemd-bus/test-bus-zero-copy.c test_bus_zero_copy_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_introspect_SOURCES = \ src/libsystemd-bus/test-bus-introspect.c test_bus_introspect_LDADD = \ libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la test_event_SOURCES = \ src/libsystemd-bus/test-event.c test_event_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la busctl_SOURCES = \ src/libsystemd-bus/busctl.c busctl_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC @@ -2214,10 +2280,14 @@ INSTALL_DIRS += \ $(sysconfdir)/udev/rules.d \ $(sysconfdir)/udev/hwdb.d +dist_network_DATA = \ + network/99-default.link + dist_udevrules_DATA += \ rules/99-systemd.rules \ rules/42-usb-hid-pm.rules \ rules/50-udev-default.rules \ + rules/60-drm.rules \ rules/60-keyboard.rules \ rules/60-persistent-storage-tape.rules \ rules/60-persistent-serial.rules \ @@ -2228,8 +2298,7 @@ dist_udevrules_DATA += \ rules/75-net-description.rules \ rules/75-tty-description.rules \ rules/78-sound-card.rules \ - rules/80-net-name-slot.rules \ - rules/85-net-configure-link.rules \ + rules/80-net-setup-link.rules \ rules/95-udev-late.rules dist_udevhwdb_DATA = \ @@ -2310,7 +2379,7 @@ libudev_core_la_SOURCES = \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-keyboard.c \ src/udev/udev-builtin-net_id.c \ - src/udev/udev-builtin-net_link.c \ + src/udev/udev-builtin-net_setup_link.c \ src/udev/udev-builtin-path_id.c \ src/udev/udev-builtin-usb_id.c \ src/udev/net/link-config.h \ @@ -2344,6 +2413,8 @@ libudev_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ + libsystemd-rtnl.la \ + libsystemd-id128-internal.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2783,6 +2854,7 @@ systemd_activate_SOURCES = \ src/activate/activate.c systemd_activate_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la @@ -3190,12 +3262,12 @@ systemd_socket_proxyd_SOURCES = \ src/socket-proxy/socket-proxyd.c systemd_socket_proxyd_LDADD = \ - libsystemd-shared.la \ libsystemd-logs.la \ + libsystemd-event.la \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la \ - libsystemd-daemon.la \ - libsystemd-bus.la + libsystemd-shared.la \ + libsystemd-daemon.la # ------------------------------------------------------------------------------ if ENABLE_COREDUMP @@ -3481,9 +3553,10 @@ systemd_hostnamed_SOURCES = \ systemd_hostnamed_LDADD = \ libsystemd-label.la \ - libsystemd-shared.la \ - libsystemd-daemon.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-hostnamed @@ -3506,14 +3579,11 @@ SYSTEM_UNIT_ALIASES += \ hostnamectl_SOURCES = \ src/hostname/hostnamectl.c -hostnamectl_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - hostnamectl_LDADD = \ - libsystemd-shared.la \ - libsystemd-dbus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la bin_PROGRAMS += \ hostnamectl @@ -3539,9 +3609,10 @@ systemd_localed_SOURCES = \ systemd_localed_LDADD = \ libsystemd-label.la \ - libsystemd-shared.la \ - libsystemd-daemon.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la nodist_systemunit_DATA += \ units/systemd-localed.service @@ -3573,14 +3644,11 @@ update-kbd-model-map: src/locale/generate-kbd-model-map localectl_SOURCES = \ src/locale/localectl.c -localectl_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - localectl_LDADD = \ - libsystemd-shared.la \ - libsystemd-dbus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la bin_PROGRAMS += \ localectl @@ -3606,8 +3674,10 @@ systemd_timedated_SOURCES = \ systemd_timedated_LDADD = \ libsystemd-label.la \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-daemon.la \ libsystemd-bus.la rootlibexec_PROGRAMS += \ @@ -3635,13 +3705,11 @@ SYSTEM_UNIT_ALIASES += \ timedatectl_SOURCES = \ src/timedate/timedatectl.c -timedatectl_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - timedatectl_LDADD = \ - libsystemd-shared.la \ - libsystemd-dbus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la bin_PROGRAMS += \ timedatectl @@ -3684,9 +3752,6 @@ systemd_machined_SOURCES = \ src/machine/machined.c \ src/machine/machined.h -systemd_machined_CFLAGS = \ - $(libsystemd_machine_core_la_CFLAGS) - systemd_machined_LDADD = \ libsystemd-machine-core.la \ $(libsystemd_machine_core_la_LIBADD) @@ -3700,16 +3765,12 @@ libsystemd_machine_core_la_SOURCES = \ src/machine/machine.h \ src/machine/machine-dbus.c -libsystemd_machine_core_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-audit.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-dbus.la \ + libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ libudev.la @@ -3719,14 +3780,11 @@ noinst_LTLIBRARIES += \ machinectl_SOURCES = \ src/machine/machinectl.c -machinectl_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - machinectl_LDADD = \ - libsystemd-shared.la \ - libsystemd-dbus.la \ - libudev.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la rootbin_PROGRAMS += \ machinectl @@ -3734,10 +3792,6 @@ rootbin_PROGRAMS += \ test_machine_tables_SOURCES = \ src/machine/test-machine-tables.c -test_machine_tables_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - test_machine_tables_LDADD = \ libsystemd-machine-core.la @@ -3776,9 +3830,6 @@ systemd_logind_SOURCES = \ nodist_systemd_logind_SOURCES = \ src/login/logind-gperf.c -systemd_logind_CFLAGS = \ - $(libsystemd_logind_core_la_CFLAGS) - systemd_logind_LDADD = \ libsystemd-logind-core.la \ $(libsystemd_logind_core_la_LIBADD) @@ -3809,17 +3860,13 @@ libsystemd_logind_core_la_SOURCES = \ src/login/login-shared.c \ src/login/login-shared.h -libsystemd_logind_core_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-audit.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-dbus.la \ libsystemd-id128-internal.la \ + libsystemd-bus-internal.la \ libudev.la if HAVE_ACL @@ -3869,13 +3916,11 @@ dist_zshcompletion_DATA += \ systemd_inhibit_SOURCES = \ src/login/inhibit.c -systemd_inhibit_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - systemd_inhibit_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la rootbin_PROGRAMS += \ systemd-inhibit @@ -3899,19 +3944,11 @@ test_inhibit_SOURCES = \ test_inhibit_LDADD = \ libsystemd-shared.la \ - libsystemd-dbus.la - -test_inhibit_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) + libsystemd-bus.la test_login_tables_SOURCES = \ src/login/test-login-tables.c -test_login_tables_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - test_login_tables_LDADD = \ libsystemd-logind-core.la @@ -3953,7 +3990,6 @@ pam_systemd_la_SOURCES = \ pam_systemd_la_CFLAGS = \ $(AM_CFLAGS) \ $(PAM_CFLAGS) \ - $(DBUS_CFLAGS) \ -fvisibility=hidden pam_systemd_la_LDFLAGS = \ @@ -3966,9 +4002,9 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-audit.la \ - libsystemd-dbus.la \ + libsystemd-bus.la \ libsystemd-shared.la \ - libsystemd-daemon-internal.la \ + libsystemd-daemon.la \ $(RT_LIBS) \ $(PAM_LIBS) @@ -4488,8 +4524,8 @@ endif INSTALL_DIRS += \ $(prefix)/lib/modules-load.d \ $(sysconfdir)/modules-load.d \ - $(prefix)/lib/net/links \ - $(sysconfdir)/net/links \ + $(prefix)/lib/systemd/network \ + $(sysconfdir)/systemd/network \ $(prefix)/lib/sysctl.d \ $(sysconfdir)/sysctl.d \ $(prefix)/lib/kernel/install.d \