chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
zsh-completion: add systemd-run
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 12c7d7cacff51cc2cab0730a9e6f5e2a82a4dfa4..8e996735ffc7fa423a0fa747bc748ab099a6d45c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@
 #  Copyright 2010-2012 Lennart Poettering
 #  Copyright 2010-2012 Kay Sievers
 #  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
 #
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
@@ -62,7 +63,6 @@ LIBSYSTEMD_JOURNAL_AGE=11
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
-dbusinterfacedir=@dbusinterfacedir@
 pamlibdir=@pamlibdir@
 pamconfdir=@pamconfdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
@@ -83,6 +83,7 @@ userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
+networkdir=$(prefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -126,7 +127,6 @@ nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
 dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
-dbusinterface_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
@@ -180,8 +180,10 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/libudev \
        -I $(top_srcdir)/src/udev \
+       -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)
@@ -319,24 +321,14 @@ rootlibexec_PROGRAMS = \
        systemd-fsck \
        systemd-ac-power \
        systemd-sysctl \
-       systemd-sleep
+       systemd-sleep \
+       systemd-socket-proxyd
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
        systemd-system-update-generator
 
-systemd_analyze_SOURCES = \
-       src/analyze/systemd-analyze.c
-
-systemd_analyze_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_analyze_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-dbus.la
-
 dist_bashcompletion_DATA = \
        shell-completion/bash/journalctl \
        shell-completion/bash/systemctl \
@@ -352,6 +344,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
@@ -425,6 +418,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 \
@@ -467,6 +461,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 \
@@ -497,12 +492,12 @@ EXTRA_DIST += \
        units/initrd-cleanup.service.in \
        units/initrd-udevadm-cleanup-db.service.in \
        units/initrd-switch-root.service.in \
-       units/systemd-nspawn@.service.in \
-       introspect.awk
+       units/systemd-nspawn@.service.in
 
 CLEANFILES += \
        units/console-shell.service.m4 \
        units/console-getty.service.m4 \
+       units/container-getty@.service.m4 \
        units/rescue.service.m4
 
 if HAVE_SYSV_COMPAT
@@ -629,6 +624,27 @@ EXTRA_DIST += \
        make-directive-index.py \
        xml_helper.py
 
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-rtnl.la
+
+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-util.h \
+       src/libsystemd-rtnl/rtnl-util.c
+
+test_rtnl_SOURCES = \
+       src/libsystemd-rtnl/test-rtnl.c
+
+test_rtnl_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-rtnl.la
+
+tests += test-rtnl
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-shared.la
@@ -647,6 +663,7 @@ libsystemd_shared_la_SOURCES = \
        src/shared/sparse-endian.h \
        src/shared/util.c \
        src/shared/util.h \
+       src/shared/udev-util.h \
        src/shared/virt.c \
        src/shared/virt.h \
        src/shared/efivars.c \
@@ -683,6 +700,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/exit-status.h \
        src/shared/utf8.c \
        src/shared/utf8.h \
+       src/shared/gunicode.c \
+       src/shared/gunicode.h \
        src/shared/pager.c \
        src/shared/pager.h \
        src/shared/ioprio.h \
@@ -729,7 +748,9 @@ 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
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -801,9 +822,6 @@ libsystemd_logs_la_SOURCES = \
        src/shared/logs-show.c \
        src/shared/logs-show.h
 
-libsystemd_logs_la_CFLAGS = \
-       $(AM_CFLAGS)
-
 libsystemd_logs_la_LIBADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la \
@@ -1076,29 +1094,9 @@ dist_dbuspolicy_DATA += \
 dist_dbussystemservice_DATA += \
        src/core/org.freedesktop.systemd1.service
 
-dbusinterface_DATA += \
-       org.freedesktop.systemd1.Manager.xml \
-       org.freedesktop.systemd1.Job.xml \
-       org.freedesktop.systemd1.Unit.xml \
-       org.freedesktop.systemd1.Service.xml \
-       org.freedesktop.systemd1.Socket.xml \
-       org.freedesktop.systemd1.Timer.xml \
-       org.freedesktop.systemd1.Target.xml \
-       org.freedesktop.systemd1.Device.xml \
-       org.freedesktop.systemd1.Mount.xml \
-       org.freedesktop.systemd1.Automount.xml \
-       org.freedesktop.systemd1.Snapshot.xml \
-       org.freedesktop.systemd1.Swap.xml \
-       org.freedesktop.systemd1.Path.xml
-
 polkitpolicy_in_in_files += \
        src/core/org.freedesktop.systemd1.policy.in.in
 
-org.freedesktop.systemd1.%.xml: systemd
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 pkgconfigdata_DATA = \
        src/core/systemd.pc
 
@@ -1135,7 +1133,9 @@ tests += \
        test-unit-name \
        test-unit-file \
        test-utf8 \
+       test-ellipsize \
        test-util \
+       test-namespace \
        test-date \
        test-sleep \
        test-replace-var \
@@ -1247,36 +1247,30 @@ test_unit_file_LDADD = \
 test_utf8_SOURCES = \
        src/test/test-utf8.c
 
-test_utf8_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_utf8_LDADD = \
        libsystemd-shared.la
 
 test_util_SOURCES = \
        src/test/test-util.c
 
-test_util_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_util_LDADD = \
        libsystemd-core.la
 
+test_namespace_SOURCES = \
+       src/test/test-namespace.c
+
+test_namespace_LDADD = \
+       libsystemd-core.la
+
 test_hashmap_SOURCES = \
        src/test/test-hashmap.c
 
-test_hashmap_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_hashmap_LDADD = \
        libsystemd-core.la
 
 test_list_SOURCES = \
        src/test/test-list.c
 
-test_list_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_list_LDADD = \
        libsystemd-core.la
 
@@ -1295,27 +1289,18 @@ test_tables_LDADD = \
 test_prioq_SOURCES = \
        src/test/test-prioq.c
 
-test_prioq_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_prioq_LDADD = \
        libsystemd-core.la
 
 test_fileio_SOURCES = \
        src/test/test-fileio.c
 
-test_fileio_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_fileio_LDADD = \
        libsystemd-core.la
 
 test_time_SOURCES = \
        src/test/test-time.c
 
-test_time_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_time_LDADD = \
        libsystemd-core.la
 
@@ -1325,6 +1310,12 @@ test_log_SOURCES = \
 test_log_LDADD = \
        libsystemd-core.la
 
+test_ellipsize_SOURCES = \
+       src/test/test-ellipsize.c
+
+test_ellipsize_LDADD = \
+       libsystemd-core.la
+
 test_date_SOURCES = \
        src/test/test-date.c
 
@@ -1478,6 +1469,18 @@ lcov-run lcov-report:
        echo "Need to reconfigure with --enable-coverage"
 endif
 
+# ------------------------------------------------------------------------------
+systemd_analyze_SOURCES = \
+       src/analyze/analyze.c
+
+systemd_analyze_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_analyze_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
        src/initctl/initctl.c
@@ -1489,7 +1492,7 @@ systemd_initctl_CFLAGS = \
 systemd_initctl_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 # ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
@@ -1502,7 +1505,7 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
+       libsystemd-bus.la \
        $(AUDIT_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1656,7 +1659,7 @@ systemd_fsck_CFLAGS = \
 
 systemd_fsck_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
+       libsystemd-bus.la \
        libudev.la
 
 # ------------------------------------------------------------------------------
@@ -1783,13 +1786,9 @@ systemd_remount_fs_LDADD = \
 systemd_cgroups_agent_SOURCES = \
        src/cgroups-agent/cgroups-agent.c
 
-systemd_cgroups_agent_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_cgroups_agent_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 # ------------------------------------------------------------------------------
 systemctl_SOURCES = \
@@ -1954,6 +1953,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 \
@@ -1966,9 +1967,15 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-bloom.h \
        src/libsystemd-bus/bus-introspect.c \
        src/libsystemd-bus/bus-introspect.h \
+       src/libsystemd-bus/bus-objects.c \
+       src/libsystemd-bus/bus-objects.h \
+       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/sd-event.c \
+       src/libsystemd-bus/bus-util.c \
+       src/libsystemd-bus/bus-util.h \
+       src/libsystemd-bus/event-util.h
 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \
@@ -2060,9 +2067,6 @@ test_bus_objects_LDADD = \
 test_bus_match_SOURCES = \
        src/libsystemd-bus/test-bus-match.c
 
-test_bus_match_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_match_LDADD = \
        libsystemd-shared.la \
        libsystemd-bus.la \
@@ -2071,9 +2075,6 @@ test_bus_match_LDADD = \
 test_bus_kernel_SOURCES = \
        src/libsystemd-bus/test-bus-kernel.c
 
-test_bus_kernel_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_kernel_LDADD = \
        libsystemd-shared.la \
        libsystemd-bus.la \
@@ -2082,9 +2083,6 @@ test_bus_kernel_LDADD = \
 test_bus_kernel_bloom_SOURCES = \
        src/libsystemd-bus/test-bus-kernel-bloom.c
 
-test_bus_kernel_bloom_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_kernel_bloom_LDADD = \
        libsystemd-shared.la \
        libsystemd-bus.la \
@@ -2093,9 +2091,6 @@ test_bus_kernel_bloom_LDADD = \
 test_bus_kernel_benchmark_SOURCES = \
        src/libsystemd-bus/test-bus-kernel-benchmark.c
 
-test_bus_kernel_benchmark_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_kernel_benchmark_LDADD = \
        libsystemd-shared.la \
        libsystemd-bus.la \
@@ -2104,9 +2099,6 @@ test_bus_kernel_benchmark_LDADD = \
 test_bus_memfd_SOURCES = \
        src/libsystemd-bus/test-bus-memfd.c
 
-test_bus_memfd_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_memfd_LDADD = \
        libsystemd-shared.la \
        libsystemd-bus.la
@@ -2114,9 +2106,6 @@ test_bus_memfd_LDADD = \
 test_bus_zero_copy_SOURCES = \
        src/libsystemd-bus/test-bus-zero-copy.c
 
-test_bus_zero_copy_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_zero_copy_LDADD = \
        libsystemd-shared.la \
        libsystemd-bus.la
@@ -2124,9 +2113,6 @@ test_bus_zero_copy_LDADD = \
 test_bus_introspect_SOURCES = \
        src/libsystemd-bus/test-bus-introspect.c
 
-test_bus_introspect_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_introspect_LDADD = \
        libsystemd-shared.la \
        libsystemd-bus.la
@@ -2185,9 +2171,7 @@ libudev_la_LDFLAGS = \
 
 libudev_la_LIBADD = \
        libsystemd-shared.la \
-       libsystemd-label.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS) \
        libsystemd-id128-internal.la
 
 pkgconfiglib_DATA += \
@@ -2241,6 +2225,9 @@ 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 \
@@ -2255,7 +2242,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/80-net-setup-link.rules \
        rules/95-udev-late.rules
 
 dist_udevhwdb_DATA = \
@@ -2336,19 +2323,30 @@ 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_setup_link.c \
        src/udev/udev-builtin-path_id.c \
-       src/udev/udev-builtin-usb_id.c
+       src/udev/udev-builtin-usb_id.c \
+       src/udev/net/link-config.h \
+       src/udev/net/link-config.c \
+       src/udev/net/link-config-parse.c \
+       src/udev/net/ethtool-util.h \
+       src/udev/net/ethtool-util.c
 
 nodist_libudev_core_la_SOURCES = \
        src/udev/keyboard-keys-from-name.h \
-       src/udev/keyboard-keys-to-name.h
+       src/udev/keyboard-keys-to-name.h \
+       src/udev/net/link-config-gperf.c
 
 BUILT_SOURCES += \
        $(nodist_libudev_core_la_SOURCES)
 
 CLEANFILES += \
        src/udev/keyboard-keys-from-name.gperf \
-       src/udev/keyboard-keys.txt
+       src/udev/keyboard-keys.txt \
+       src/udev/net/link-config-gperf.c
+
+EXTRA_DIST += \
+       src/udev/net/link-config-gperf.gperf
 
 libudev_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2359,8 +2357,9 @@ libudev_core_la_LIBADD = \
        libudev-private.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS) \
        libsystemd-shared.la \
+       libsystemd-rtnl.la \
+       libsystemd-id128-internal.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
@@ -2421,6 +2420,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
        libudev-core.la \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 # Update hwdb on installation. Do not bother if installing
@@ -2658,13 +2658,14 @@ src/gudev/GUdev-1.0.gir: libgudev-1.0.la
 src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
 
 src_gudev_GUdev_1_0_gir_CFLAGS = \
+       $(AM_CFLAGS) \
        $(INCLUDES) \
        -D_GUDEV_COMPILATION \
        -D_GUDEV_WORK_AROUND_DEV_T_BUG \
        -I$(top_srcdir)/src \
        -I$(top_builddir)/src \
-       -I$(top_srcdir)/src/gdev \
-       -I$(top_builddir)/src/gdev
+       -I$(top_srcdir)/src/gudev \
+       -I$(top_builddir)/src/gudev
 
 src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
 
@@ -2747,10 +2748,7 @@ libsystemd_id128_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
-       libsystemd-shared.la \
-       libsystemd-label.la \
-       libsystemd-daemon-internal.la \
-       $(RT_LIBS)
+       libsystemd-shared.la
 
 libsystemd_id128_internal_la_SOURCES = \
        $(libsystemd_id128_la_SOURCES)
@@ -2821,12 +2819,13 @@ systemd_cat_LDADD = \
        libsystemd-shared.la \
        libsystemd-journal-internal.la
 
-journalctl_SOURCES = \
-       src/journal/journalctl.c
-
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
        $(AM_CFLAGS)
 
+journalctl_SOURCES = \
+       src/journal/journalctl.c
+
 journalctl_LDADD = \
        libsystemd-shared.la \
        libsystemd-journal-internal.la \
@@ -2946,6 +2945,7 @@ test_catalog_LDADD = \
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
        src/systemd/sd-journal.h \
+       src/systemd/_sd-common.h \
        src/journal/journal-file.c \
        src/journal/journal-file.h \
        src/journal/journal-vacuum.c \
@@ -2996,11 +2996,11 @@ libsystemd_journal_internal_la_SOURCES = \
        src/journal/journald-rate-limit.h \
        src/journal/journal-internal.h
 
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 libsystemd_journal_internal_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD = \
-       libsystemd-label.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
        libudev.la \
@@ -3110,7 +3110,8 @@ tests += \
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
-       src/systemd/sd-messages.h
+       src/systemd/sd-messages.h \
+       src/systemd/_sd-common.h
 
 lib_LTLIBRARIES += \
        libsystemd-journal.la
@@ -3181,8 +3182,8 @@ systemd_journal_gatewayd_LDADD = \
        $(MICROHTTPD_LIBS)
 
 systemd_journal_gatewayd_CFLAGS = \
-       -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
        $(AM_CFLAGS) \
+       -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
        $(MICROHTTPD_CFLAGS)
 
 dist_systemunit_DATA += \
@@ -3199,6 +3200,19 @@ endif
 EXTRA_DIST += \
        units/systemd-journal-gatewayd.service.in
 
+# ------------------------------------------------------------------------------
+
+systemd_socket_proxyd_SOURCES = \
+       src/socket-proxy/socket-proxyd.c
+
+systemd_socket_proxyd_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-logs.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon.la \
+       libsystemd-bus.la
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -3420,6 +3434,26 @@ endif
 EXTRA_DIST += \
        units/systemd-backlight@.service.in
 
+# ------------------------------------------------------------------------------
+if ENABLE_RFKILL
+rootlibexec_PROGRAMS += \
+       systemd-rfkill
+
+nodist_systemunit_DATA += \
+       units/systemd-rfkill@.service
+
+systemd_rfkill_SOURCES = \
+       src/rfkill/rfkill.c
+
+systemd_rfkill_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libudev-private.la
+endif
+
+EXTRA_DIST += \
+       units/systemd-rfkill@.service.in
+
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -3461,15 +3495,11 @@ if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
        src/hostname/hostnamed.c
 
-systemd_hostnamed_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_hostnamed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 rootlibexec_PROGRAMS += \
        systemd-hostnamed
@@ -3486,14 +3516,6 @@ dist_dbussystemservice_DATA += \
 polkitpolicy_files += \
        src/hostname/org.freedesktop.hostname1.policy
 
-dbusinterface_DATA += \
-       org.freedesktop.hostname1.xml
-
-org.freedesktop.hostname1.xml: systemd-hostnamed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 SYSTEM_UNIT_ALIASES += \
        systemd-hostnamed.service dbus-org.freedesktop.hostname1.service
 
@@ -3531,15 +3553,11 @@ if ENABLE_LOCALED
 systemd_localed_SOURCES = \
        src/locale/localed.c
 
-systemd_localed_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_localed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 nodist_systemunit_DATA += \
        units/systemd-localed.service
@@ -3556,14 +3574,6 @@ dist_dbussystemservice_DATA += \
 polkitpolicy_files += \
        src/locale/org.freedesktop.locale1.policy
 
-dbusinterface_DATA += \
-       org.freedesktop.locale1.xml
-
-org.freedesktop.locale1.xml: systemd-localed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 SYSTEM_UNIT_ALIASES += \
        systemd-localed.service dbus-org.freedesktop.locale1.service
 
@@ -3579,13 +3589,9 @@ 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-bus.la \
        libsystemd-id128-internal.la
 
 bin_PROGRAMS += \
@@ -3610,15 +3616,11 @@ if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
        src/timedate/timedated.c
 
-systemd_timedated_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_timedated_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 rootlibexec_PROGRAMS += \
        systemd-timedated
@@ -3635,14 +3637,6 @@ nodist_systemunit_DATA += \
 polkitpolicy_files += \
        src/timedate/org.freedesktop.timedate1.policy
 
-org.freedesktop.timedate1.xml: systemd-timedated
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-dbusinterface_DATA += \
-       org.freedesktop.timedate1.xml
-
 INSTALL_DIRS += \
        $(prefix)/lib/systemd/ntp-units.d \
        $(sysconfdir)/systemd/ntp-units.d
@@ -3659,7 +3653,7 @@ timedatectl_CFLAGS = \
 
 timedatectl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 bin_PROGRAMS += \
        timedatectl
@@ -3684,9 +3678,6 @@ libnss_myhostname_la_SOURCES = \
        src/nss-myhostname/ifconf.h \
        src/nss-myhostname/netlink.c
 
-libnss_myhostname_la_CFLAGS = \
-       $(AM_CFLAGS)
-
 libnss_myhostname_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -module \
@@ -3705,9 +3696,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)
@@ -3721,16 +3709,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.la \
        libsystemd-id128-internal.la \
        libudev.la
 
@@ -3746,8 +3730,7 @@ machinectl_CFLAGS = \
 
 machinectl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
-       libudev.la
+       libsystemd-bus.la
 
 rootbin_PROGRAMS += \
        machinectl
@@ -3755,10 +3738,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
 
@@ -3832,7 +3811,7 @@ libsystemd_logind_core_la_SOURCES = \
 
 libsystemd_logind_core_la_CFLAGS = \
        $(AM_CFLAGS) \
-        $(DBUS_CFLAGS)
+       $(DBUS_CFLAGS)
 
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
@@ -3896,7 +3875,7 @@ systemd_inhibit_CFLAGS = \
 
 systemd_inhibit_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 rootbin_PROGRAMS += \
        systemd-inhibit
@@ -4410,11 +4389,6 @@ EXTRA_DIST += \
        man/custom-man.xsl
 
 # ------------------------------------------------------------------------------
-DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
-
-CLEANFILES += \
-       $(dbusinterface_DATA)
-
 if HAVE_SYSV_COMPAT
 sysvinit_DATA = \
        docs/sysvinit/README
@@ -4457,7 +4431,6 @@ SYSINIT_TARGET_WANTS += \
        systemd-update-utmp.service
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
-       systemd-fsck-root.service \
        tmp.mount
 MULTI_USER_TARGET_WANTS += \
        getty.target \
@@ -4515,6 +4488,8 @@ endif
 INSTALL_DIRS += \
        $(prefix)/lib/modules-load.d \
        $(sysconfdir)/modules-load.d \
+       $(prefix)/lib/systemd/network \
+       $(sysconfdir)/systemd/network \
        $(prefix)/lib/sysctl.d \
        $(sysconfdir)/sysctl.d \
        $(prefix)/lib/kernel/install.d \
@@ -4549,7 +4524,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
        --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
-       --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
        --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
Unnamed repository; edit this file 'description' to name the repository.