chiark / gitweb /
main: we want all setup functions to be in files called xxx-setup.[ch]
[elogind.git] / Makefile.am
index 07b30ebd1e16ddba8447f1ffc92f770ca5bcedcc..8b1cafe702855faa5e4c35dbc8f94975afe03f97 100644 (file)
@@ -1,19 +1,21 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*- */
+#
 #  This file is part of systemd.
 #
 #  Copyright 2010-2012 Lennart Poettering
 #  Copyright 2010-2012 Kay Sievers
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 #
 #  systemd is distributed in the hope that it will be useful, but
 #  WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  General Public License for more details.
+#  Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
+#  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -92,6 +94,10 @@ polkitpolicy_in_files =
 dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_man_MANS =
+dist_pkgsysconf_DATA =
+dist_dbuspolicy_DATA =
+dbusinterface_DATA =
+dist_dbussystemservice_DATA =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -120,12 +126,12 @@ AM_CPPFLAGS = \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
+       -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/shared \
-       -I $(top_srcdir)/src/readahead \
        -I $(top_srcdir)/src/login \
-       -I $(top_srcdir)/src/journal \
        -I $(top_srcdir)/src/systemd \
+       -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/udev
 
 AM_CFLAGS = $(WARNINGFLAGS)
@@ -236,31 +242,6 @@ noinst_PROGRAMS = \
        test-install \
        test-watchdog
 
-dist_pkgsysconf_DATA = \
-       src/system.conf \
-       src/user.conf
-
-dist_dbuspolicy_DATA = \
-       src/org.freedesktop.systemd1.conf
-
-dist_dbussystemservice_DATA = \
-       src/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
-
 dist_bashcompletion_DATA = \
        src/systemd-bash-completion.sh
 
@@ -389,7 +370,6 @@ EXTRA_DIST += \
        units/udev.service \
        units/udev-trigger.service \
        units/udev-settle.service \
-       src/systemd.pc.in \
        introspect.awk \
        man/custom-html.xsl
 
@@ -455,24 +435,11 @@ endif
 dist_doc_DATA = \
        README \
        NEWS \
-       LICENSE \
+       LICENSE.LGPL2.1 \
+       LICENSE.GPL2 \
+       LICENSE.MIT \
        DISTRO_PORTING
 
-pkgconfigdata_DATA = \
-       src/systemd.pc
-
-# First passed through sed, followed by intltool
-polkitpolicy_in_in_files = \
-       src/org.freedesktop.systemd1.policy.in.in
-
-nodist_polkitpolicy_DATA = \
-       $(polkitpolicy_in_files:.policy.in=.policy) \
-       $(polkitpolicy_in_in_files:.policy.in.in=.policy)
-
-EXTRA_DIST += \
-       $(polkitpolicy_in_files) \
-       $(polkitpolicy_in_in_files)
-
 @INTLTOOL_POLICY_RULE@
 
 # ------------------------------------------------------------------------------
@@ -552,6 +519,9 @@ noinst_LTLIBRARIES += \
        libsystemd-shared.la
 
 libsystemd_shared_la_SOURCES = \
+       src/missing.h \
+       src/linux/auto_dev-ioctl.h \
+       src/linux/fanotify.h \
        src/shared/util.c \
        src/shared/util.h \
        src/shared/virt.c \
@@ -579,14 +549,47 @@ libsystemd_shared_la_SOURCES = \
        src/shared/socket-util.h \
        src/shared/cgroup-util.c \
        src/shared/cgroup-util.h \
+       src/shared/dbus-common.c \
+       src/shared/dbus-common.h \
+       src/shared/logs-show.c \
+       src/shared/logs-show.h \
+       src/shared/cgroup-show.c \
+       src/shared/cgroup-show.h \
+       src/shared/unit-name.c \
+       src/shared/unit-name.h \
+       src/shared/utmp-wtmp.c \
+       src/shared/utmp-wtmp.h \
+       src/shared/watchdog.c \
+       src/shared/watchdog.h \
+       src/shared/spawn-ask-password-agent.c \
+       src/shared/spawn-ask-password-agent.h \
+       src/shared/mount-setup.c \
+       src/shared/mount-setup.h \
+       src/shared/machine-id-setup.c \
+       src/shared/machine-id-setup.h \
+       src/shared/loopback-setup.h \
+       src/shared/loopback-setup.c \
+       src/shared/specifier.c \
+       src/shared/specifier.h \
+       src/shared/spawn-polkit-agent.c \
+       src/shared/spawn-polkit-agent.h \
        src/shared/list.h \
-       src/shared/macro.h
+       src/shared/macro.h \
+       src/shared/ask-password-api.h
+
+libsystemd_shared_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-label.la
 
 libsystemd_label_la_SOURCES = \
+       src/shared/install.c \
+       src/shared/install.h \
+       src/shared/path-lookup.c \
+       src/shared/path-lookup.h \
        src/shared/cgroup-label.c \
        src/shared/socket-label.c \
        src/shared/label.c \
@@ -596,6 +599,7 @@ libsystemd_label_la_SOURCES = \
 
 libsystemd_label_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
        $(SELINUX_CFLAGS)
 
 libsystemd_label_la_LIBADD = \
@@ -628,12 +632,13 @@ libsystemd_audit_la_LIBADD = \
        libsystemd-capability.la
 
 # ------------------------------------------------------------------------------
+if HAVE_ACL
 noinst_LTLIBRARIES += \
        libsystemd-acl.la
 
 libsystemd_acl_la_SOURCES = \
-       src/shared/acl.c \
-       src/shared/acl.h
+       src/shared/acl-util.c \
+       src/shared/acl-util.h
 
 libsystemd_acl_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -641,141 +646,108 @@ libsystemd_acl_la_CFLAGS = \
 
 libsystemd_acl_la_LIBADD = \
        $(ACL_LIBS)
+endif
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-core.la
 
 libsystemd_core_la_SOURCES = \
-       src/unit.c \
-       src/unit.h \
-       src/job.c \
-       src/job.h \
-       src/manager.c \
-       src/manager.h \
-       src/path-lookup.c \
-       src/path-lookup.h \
-       src/load-fragment.c \
-       src/load-fragment.h \
-       src/service.c \
-       src/service.h \
-       src/automount.c \
-       src/automount.h \
-       src/mount.c \
-       src/mount.h \
-       src/swap.c \
-       src/swap.h \
-       src/device.c \
-       src/device.h \
-       src/target.c \
-       src/target.h \
-       src/snapshot.c \
-       src/snapshot.h \
-       src/socket.c \
-       src/socket.h \
-       src/timer.c \
-       src/timer.h \
-       src/path.c \
-       src/path.h \
-       src/load-dropin.c \
-       src/load-dropin.h \
-       src/execute.c \
-       src/execute.h \
-       src/utmp-wtmp.c \
-       src/utmp-wtmp.h \
-       src/dbus.c \
-       src/dbus.h \
-       src/dbus-manager.c \
-       src/dbus-manager.h \
-       src/dbus-unit.c \
-       src/dbus-unit.h \
-       src/dbus-job.c \
-       src/dbus-job.h \
-       src/dbus-service.c \
-       src/dbus-service.h \
-       src/dbus-socket.c \
-       src/dbus-socket.h \
-       src/dbus-timer.c \
-       src/dbus-timer.h \
-       src/dbus-target.c \
-       src/dbus-target.h \
-       src/dbus-mount.c \
-       src/dbus-mount.h \
-       src/dbus-automount.c \
-       src/dbus-automount.h \
-       src/dbus-swap.c \
-       src/dbus-swap.h \
-       src/dbus-snapshot.c \
-       src/dbus-snapshot.h \
-       src/dbus-device.c \
-       src/dbus-device.h \
-       src/dbus-execute.c \
-       src/dbus-execute.h \
-       src/dbus-path.c \
-       src/dbus-path.h \
-       src/cgroup.c \
-       src/cgroup.h \
-       src/mount-setup.c \
-       src/mount-setup.h \
-       src/hostname-setup.c \
-       src/hostname-setup.h \
-       src/selinux-setup.c \
-       src/selinux-setup.h \
-       src/ima-setup.c \
-       src/ima-setup.h \
-       src/loopback-setup.h \
-       src/loopback-setup.c \
-       src/kmod-setup.c \
-       src/kmod-setup.h \
-       src/locale-setup.h \
-       src/locale-setup.c \
-       src/machine-id-setup.c \
-       src/machine-id-setup.h \
-       src/fdset.c \
-       src/fdset.h \
-       src/condition.c \
-       src/condition.h \
-       src/dbus-common.c \
-       src/dbus-common.h \
-       src/install.c \
-       src/install.h \
-       src/specifier.c \
-       src/specifier.h \
-       src/namespace.c \
-       src/namespace.h \
-       src/unit-name.c \
-       src/unit-name.h \
-       src/tcpwrap.c \
-       src/tcpwrap.h \
-       src/cgroup-attr.c \
-       src/cgroup-attr.h \
-       src/watchdog.c \
-       src/watchdog.h \
        src/def.h \
-       src/missing.h \
-       src/securebits.h \
-       src/linux/auto_dev-ioctl.h \
-       src/linux/fanotify.h \
-       src/initreq.h \
-       src/special.h \
-       src/dbus-common.h \
-       src/bus-errors.h \
-       src/cgroup-show.h \
-       src/build.h \
-       src/umount.h \
-       src/ask-password-api.h \
-       src/sysfs-show.h \
-       src/polkit.h \
-       src/dbus-loop.h \
-       src/spawn-agent.h \
-       src/logs-show.h
+       src/core/unit.c \
+       src/core/unit.h \
+       src/core/job.c \
+       src/core/job.h \
+       src/core/manager.c \
+       src/core/manager.h \
+       src/core/load-fragment.c \
+       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/target.c \
+       src/core/target.h \
+       src/core/snapshot.c \
+       src/core/snapshot.h \
+       src/core/socket.c \
+       src/core/socket.h \
+       src/core/timer.c \
+       src/core/timer.h \
+       src/core/path.c \
+       src/core/path.h \
+       src/core/load-dropin.c \
+       src/core/load-dropin.h \
+       src/core/execute.c \
+       src/core/execute.h \
+       src/core/dbus.c \
+       src/core/dbus.h \
+       src/core/dbus-manager.c \
+       src/core/dbus-manager.h \
+       src/core/dbus-unit.c \
+       src/core/dbus-unit.h \
+       src/core/dbus-job.c \
+       src/core/dbus-job.h \
+       src/core/dbus-service.c \
+       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-target.c \
+       src/core/dbus-target.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-execute.c \
+       src/core/dbus-execute.h \
+       src/core/dbus-path.c \
+       src/core/dbus-path.h \
+       src/core/cgroup.c \
+       src/core/cgroup.h \
+       src/core/selinux-setup.c \
+       src/core/selinux-setup.h \
+       src/core/ima-setup.c \
+       src/core/ima-setup.h \
+       src/core/kmod-setup.c \
+       src/core/kmod-setup.h \
+       src/core/locale-setup.h \
+       src/core/locale-setup.c \
+       src/core/hostname-setup.c \
+       src/core/hostname-setup.h \
+       src/core/fdset.c \
+       src/core/fdset.h \
+       src/core/condition.c \
+       src/core/condition.h \
+       src/core/namespace.c \
+       src/core/namespace.h \
+       src/core/tcpwrap.c \
+       src/core/tcpwrap.h \
+       src/core/cgroup-attr.c \
+       src/core/cgroup-attr.h \
+       src/core/securebits.h \
+       src/core/initreq.h \
+       src/core/special.h \
+       src/core/bus-errors.h \
+       src/core/build.h \
+       src/core/sysfs-show.h
 
 nodist_libsystemd_core_la_SOURCES = \
-       src/load-fragment-gperf.c \
-       src/load-fragment-gperf-nulstr.c
-
-EXTRA_DIST += \
-       src/load-fragment-gperf.gperf.m4
+       src/core/load-fragment-gperf.c \
+       src/core/load-fragment-gperf-nulstr.c
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -797,9 +769,21 @@ libsystemd_core_la_LIBADD = \
        $(CAP_LIBS) \
        $(KMOD_LIBS)
 
+src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
+
+EXTRA_DIST += \
+       src/core/load-fragment-gperf.gperf.m4
+
+CLEANFILES += \
+       src/core/load-fragment-gperf.gperf \
+       src/core/load-fragment-gperf.c \
+       src/core/load-fragment-gperf-nulstr.c
+
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
-       src/main.c
+       src/core/main.c
 
 systemd_CFLAGS = \
        $(AM_CFLAGS) \
@@ -810,9 +794,48 @@ systemd_LDADD = \
        libsystemd-daemon.la \
        libsystemd-id128.la
 
+dist_pkgsysconf_DATA += \
+       src/core/system.conf \
+       src/core/user.conf
+
+dist_dbuspolicy_DATA += \
+       src/core/org.freedesktop.systemd1.conf
+
+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
+
+EXTRA_DIST += \
+       src/core/systemd.pc.in
+
 # ------------------------------------------------------------------------------
 test_engine_SOURCES = \
-       src/test-engine.c
+       src/test/test-engine.c
 
 test_engine_CFLAGS = \
        $(AM_CFLAGS) \
@@ -823,7 +846,7 @@ test_engine_LDADD = \
        libsystemd-daemon.la
 
 test_job_type_SOURCES = \
-       src/test-job-type.c
+       src/test/test-job-type.c
 
 test_job_type_CFLAGS = \
        $(AM_CFLAGS) \
@@ -833,57 +856,51 @@ test_job_type_LDADD = \
        libsystemd-core.la
 
 test_ns_SOURCES = \
-       src/test-ns.c
+       src/test/test-ns.c
 
 test_ns_LDADD = \
        libsystemd-core.la
 
 test_loopback_SOURCES = \
-       src/test-loopback.c \
-       src/loopback-setup.c
+       src/test/test-loopback.c
 
 test_loopback_LDADD = \
        libsystemd-shared.la
 
 test_hostname_SOURCES = \
-       src/test-hostname.c \
-       src/hostname-setup.c
+       src/test/test-hostname.c
 
 test_hostname_LDADD = \
-       libsystemd-shared.la
+       libsystemd-core.la
 
 test_daemon_SOURCES = \
-       src/test-daemon.c
+       src/test/test-daemon.c
 
 test_daemon_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
-       src/test-cgroup.c
+       src/test/test-cgroup.c
 
 test_cgroup_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
 test_env_replace_SOURCES = \
-       src/test-env-replace.c
+       src/test/test-env-replace.c
 
 test_env_replace_LDADD = \
        libsystemd-shared.la
 
 test_strv_SOURCES = \
-       src/test-strv.c \
-       src/specifier.c
+       src/test/test-strv.c
 
 test_strv_LDADD = \
        libsystemd-shared.la
 
 test_install_SOURCES = \
-       src/test-install.c \
-       src/install.c \
-       src/path-lookup.c \
-       src/unit-name.c
+       src/test/test-install.c
 
 test_install_CFLAGS = \
        $(AM_CFLAGS) \
@@ -894,17 +911,14 @@ test_install_LDADD = \
        libsystemd-shared.la
 
 test_watchdog_SOURCES = \
-       src/test-watchdog.c \
-       src/watchdog.c \
-       src/watchdog.h
+       src/test/test-watchdog.c
 
 test_watchdog_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
-       src/initctl.c \
-       src/dbus-common.c
+       src/initctl.c
 
 systemd_initctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -917,9 +931,7 @@ systemd_initctl_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
-       src/update-utmp.c \
-       src/dbus-common.c \
-       src/utmp-wtmp.c
+       src/update-utmp.c
 
 systemd_update_utmp_CFLAGS = \
        $(AM_CFLAGS) \
@@ -933,7 +945,6 @@ systemd_update_utmp_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_shutdownd_SOURCES = \
-       src/utmp-wtmp.c \
        src/shutdownd.c
 
 systemd_shutdownd_LDADD = \
@@ -946,11 +957,9 @@ pkginclude_HEADERS += \
 
 # ------------------------------------------------------------------------------
 systemd_shutdown_SOURCES = \
-       src/mount-setup.c \
-       src/umount.c \
-       src/shutdown.c \
-       src/watchdog.c \
-       src/watchdog.h
+       src/core/umount.c \
+       src/core/umount.h \
+       src/core/shutdown.c
 
 systemd_shutdown_LDADD = \
        libsystemd-label.la \
@@ -979,8 +988,7 @@ systemd_tmpfiles_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
-       src/machine-id-setup.c \
-       src/machine-id-main.c
+       src/machine-id-setup/machine-id-setup-main.c
 
 systemd_machine_id_setup_LDADD = \
        libsystemd-label.la \
@@ -996,8 +1004,7 @@ systemd_sysctl_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_fsck_SOURCES = \
-       src/fsck.c \
-       src/dbus-common.c
+       src/fsck.c
 
 systemd_fsck_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1032,8 +1039,7 @@ systemd_detect_virt_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
-       src/getty-generator.c \
-       src/unit-name.c
+       src/getty-generator.c
 
 systemd_getty_generator_LDADD = \
        libsystemd-label.la \
@@ -1049,16 +1055,14 @@ systemd_rc_local_generator_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_remount_api_vfs_SOURCES = \
-       src/remount-api-vfs.c \
-       src/mount-setup.c
+       src/remount-api-vfs.c
 
 systemd_remount_api_vfs_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_cgroups_agent_SOURCES = \
-       src/cgroups-agent.c \
-       src/dbus-common.c
+       src/cgroups-agent.c
 
 systemd_cgroups_agent_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1070,15 +1074,7 @@ systemd_cgroups_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemctl_SOURCES = \
-       src/systemctl.c \
-       src/utmp-wtmp.c \
-       src/dbus-common.c \
-       src/path-lookup.c \
-       src/cgroup-show.c \
-       src/unit-name.c \
-       src/install.c \
-       src/spawn-agent.c \
-       src/logs-show.c
+       src/systemctl.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1119,8 +1115,7 @@ systemd_reply_password_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
-       src/cgls.c \
-       src/cgroup-show.c
+       src/cgls.c
 
 systemd_cgls_LDADD = \
        libsystemd-shared.la
@@ -1134,13 +1129,12 @@ systemd_cgtop_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_nspawn_SOURCES = \
-       src/nspawn.c \
-       src/loopback-setup.c
+       src/nspawn.c
 
 systemd_nspawn_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
        libsystemd-capability.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la
 
 # ------------------------------------------------------------------------------
@@ -1153,8 +1147,7 @@ systemd_stdio_bridge_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
        src/tty-ask-password-agent.c \
-       src/ask-password-api.c \
-       src/utmp-wtmp.c
+       src/ask-password-api.c
 
 systemd_tty_ask_password_agent_LDADD = \
        libsystemd-label.la \
@@ -1610,6 +1603,8 @@ libgudev_1_0_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -I$(top_builddir)/src\
        -I$(top_srcdir)/src\
+       -I$(top_builddir)/src/udev \
+       -I$(top_srcdir)/src/udev \
        -I$(top_builddir)/src/udev/gudev \
        -I$(top_srcdir)/src/udev/gudev \
        -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
@@ -1658,43 +1653,45 @@ src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/ud
            $@.tmp && mv $@.tmp $@
 
 if ENABLE_INTROSPECTION
-src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la $(G_IR_SCANNER)
-       $(AM_V_GEN)$(G_IR_SCANNER) -v \
-               --warn-all \
-               --namespace GUdev \
-               --nsversion=1.0 \
-               --include=GObject-2.0 \
-               --library=gudev-1.0 \
-               --library-path=$(top_builddir)/src/udev \
-               --library-path=$(top_builddir)/src/udev/gudev \
-               --output $@ \
-               --pkg=glib-2.0 \
-               --pkg=gobject-2.0 \
-               --pkg-export=gudev-1.0 \
-               --c-include=gudev/gudev.h \
-               -I$(top_srcdir)/src/udev \
-               -I$(top_builddir)/src/udev \
-               -D_GUDEV_COMPILATION \
-               -D_GUDEV_WORK_AROUND_DEV_T_BUG \
-               $(top_srcdir)/src/udev/gudev/gudev.h \
-               $(top_srcdir)/src/udev/gudev/gudevtypes.h \
-               $(top_srcdir)/src/udev/gudev/gudevenums.h \
-               $(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \
-               $(top_srcdir)/src/udev/gudev/gudevclient.h \
-               $(top_srcdir)/src/udev/gudev/gudevdevice.h \
-               $(top_srcdir)/src/udev/gudev/gudevenumerator.h \
-               $(top_srcdir)/src/udev/gudev/gudevclient.c \
-               $(top_srcdir)/src/udev/gudev/gudevdevice.c \
-               $(top_srcdir)/src/udev/gudev/gudevenumerator.c
-
-src/udev/gudev/GUdev-1.0.typelib: src/udev/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
-       $(AM_V_GEN)g-ir-compiler $< -o $@
-
-girdir = $(GIRDIR)
+-include $(INTROSPECTION_MAKEFILE)
+
+src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la
+
+src_udev_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
+
+src_udev_gudev_GUdev_1_0_gir_CFLAGS = \
+       $(INCLUDES) \
+       -D_GUDEV_COMPILATION \
+       -D_GUDEV_WORK_AROUND_DEV_T_BUG \
+       -I$(top_srcdir)/src/udev \
+       -I$(top_builddir)/src/udev
+
+src_udev_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
+
+src_udev_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
+       --pkg-export=gudev-1.0 \
+       --warn-all
+
+src_udev_gudev_GUdev_1_0_gir_FILES = \
+       $(top_srcdir)/src/udev/gudev/gudev.h \
+       $(top_srcdir)/src/udev/gudev/gudevtypes.h \
+       $(top_srcdir)/src/udev/gudev/gudevenums.h \
+       $(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \
+       $(top_srcdir)/src/udev/gudev/gudevclient.h \
+       $(top_srcdir)/src/udev/gudev/gudevdevice.h \
+       $(top_srcdir)/src/udev/gudev/gudevenumerator.h \
+       $(top_srcdir)/src/udev/gudev/gudevclient.c \
+       $(top_srcdir)/src/udev/gudev/gudevdevice.c \
+       $(top_srcdir)/src/udev/gudev/gudevenumerator.c
+
+INTROSPECTION_GIRS = src/udev/gudev/GUdev-1.0.gir
+INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
+
+girdir = $(datadir)/gir-1.0
 gir_DATA = \
        src/udev/gudev/GUdev-1.0.gir
 
-typelibsdir = $(GIRTYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = \
        src/udev/gudev/GUdev-1.0.typelib
 
@@ -1825,7 +1822,7 @@ dist_udevkeymapforcerel_DATA = \
        src/udev/keymap/force-release-maps/common-volume-keys
 
 src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
-       $(AM_V_at)mkdir -p src/keymap
+       $(AM_V_at)mkdir -p src/udev/keymap
        $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
 src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt
@@ -1875,7 +1872,7 @@ libsystemd_id128_la_LIBADD = \
        libsystemd-shared.la
 
 test_id128_SOURCES = \
-       src/test-id128.c
+       src/test/test-id128.c
 
 test_id128_LDADD = \
        libsystemd-shared.la \
@@ -1970,8 +1967,7 @@ systemd_cat_LDADD = \
        libsystemd-journal.la
 
 journalctl_SOURCES = \
-       src/journal/journalctl.c \
-       src/logs-show.c
+       src/journal/journalctl.c
 
 journalctl_LDADD = \
        libsystemd-shared.la \
@@ -2344,8 +2340,7 @@ systemd_cryptsetup_LDADD = \
        $(LIBCRYPTSETUP_LIBS)
 
 systemd_cryptsetup_generator_SOURCES = \
-       src/cryptsetup/cryptsetup-generator.c \
-       src/unit-name.c
+       src/cryptsetup/cryptsetup-generator.c
 
 systemd_cryptsetup_generator_LDADD = \
        libsystemd-label.la \
@@ -2366,8 +2361,8 @@ endif
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
        src/hostname/hostnamed.c \
-       src/dbus-common.c \
-       src/polkit.c
+       src/polkit.c \
+       src/polkit.h
 
 systemd_hostnamed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2417,8 +2412,8 @@ endif
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
        src/locale/localed.c \
-       src/dbus-common.c \
-       src/polkit.c
+       src/polkit.c \
+       src/polkit.h
 
 systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2479,8 +2474,8 @@ endif
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
        src/timedate/timedated.c \
-       src/dbus-common.c \
-       src/polkit.c
+       src/polkit.c \
+       src/polkit.h
 
 systemd_timedated_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2543,9 +2538,10 @@ systemd_logind_SOURCES = \
        src/login/logind-session-dbus.c \
        src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
-       src/dbus-common.c \
        src/dbus-loop.c \
+       src/dbus-loop.h \
        src/polkit.c \
+       src/polkit.h \
        src/login/logind-acl.h
 
 nodist_systemd_logind_SOURCES = \
@@ -2583,9 +2579,7 @@ rootlibexec_PROGRAMS += \
 
 loginctl_SOURCES = \
        src/login/loginctl.c \
-       src/login/sysfs-show.c \
-       src/dbus-common.c \
-       src/cgroup-show.c
+       src/login/sysfs-show.c
 
 loginctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2627,8 +2621,7 @@ libsystemd_login_la_LIBADD = \
 
 if HAVE_PAM
 pam_systemd_la_SOURCES = \
-       src/login/pam-module.c \
-       src/dbus-common.c
+       src/login/pam-module.c
 
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2702,7 +2695,7 @@ polkitpolicy_in_files += \
 logind-install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
-                $(DESTDIR)$(localstatedir)/lib/systemd
+               $(DESTDIR)$(localstatedir)/lib/systemd
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.login1.service && \
                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@@ -2850,10 +2843,6 @@ src/%: src/%.m4
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
 
-src/load-fragment-gperf-nulstr.c: src/load-fragment-gperf.gperf
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
-
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
@@ -2868,16 +2857,21 @@ units/%: units/%.m4 Makefile
 units/user/%: units/%.m4 Makefile
        $(M4_PROCESS_USER)
 
+nodist_polkitpolicy_DATA = \
+       $(polkitpolicy_in_files:.policy.in=.policy) \
+       $(polkitpolicy_in_in_files:.policy.in.in=.policy)
+
+EXTRA_DIST += \
+       $(polkitpolicy_in_files) \
+       $(polkitpolicy_in_in_files)
+
 CLEANFILES += \
        $(nodist_systemunit_DATA) \
        $(nodist_userunit_DATA) \
        $(nodist_man_MANS) \
        $(pkgconfigdata_DATA) \
        $(pkgconfiglib_DATA) \
-       $(nodist_polkitpolicy_DATA) \
-       src/load-fragment-gperf.gperf \
-       src/load-fragment-gperf.c \
-       src/load-fragment-gperf-nulstr.c
+       $(nodist_polkitpolicy_DATA)
 
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
@@ -2917,11 +2911,6 @@ endif
 
 DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
 
-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
-
 CLEANFILES += \
        $(dbusinterface_DATA)