X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=813ced272e511d38c79f9f1b211bbd8c5e35342c;hp=f7864d8309276231bd17dcdb3f7e6a69e642d38c;hb=bd5b0d57ef3fceef3ed61d0e06a8e1f3d8417048;hpb=78a825f216d39ee0295b00647b059d45467e1d02

diff --git a/Makefile.am b/Makefile.am
index f7864d830..813ced272 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*- */
+#
 #  This file is part of systemd.
 #
 #  Copyright 2010-2012 Lennart Poettering
@@ -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 \
@@ -123,7 +129,6 @@ AM_CPPFLAGS = \
 	-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 \
@@ -201,7 +206,8 @@ bin_PROGRAMS = \
 	systemd-cgls \
 	systemd-cgtop \
 	systemd-stdio-bridge \
-	systemd-nspawn
+	systemd-nspawn \
+	systemd-detect-virt
 
 dist_bin_SCRIPTS = \
 	src/systemd-analyze
@@ -219,7 +225,6 @@ rootlibexec_PROGRAMS = \
 	systemd-fsck \
 	systemd-timestamp \
 	systemd-ac-power \
-	systemd-detect-virt \
 	systemd-sysctl
 
 systemgenerator_PROGRAMS = \
@@ -238,31 +243,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
 
@@ -391,7 +371,6 @@ EXTRA_DIST += \
 	units/udev.service \
 	units/udev-trigger.service \
 	units/udev-settle.service \
-	src/systemd.pc.in \
 	introspect.awk \
 	man/custom-html.xsl
 
@@ -462,21 +441,6 @@ dist_doc_DATA = \
 	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@
 
 # ------------------------------------------------------------------------------
@@ -521,6 +485,7 @@ MANPAGES = \
 	man/systemd-ask-password.1 \
 	man/systemd-cat.1 \
 	man/systemd-machine-id-setup.1 \
+	man/systemd-detect-virt.1 \
 	man/journald.conf.5 \
 	man/journalctl.1
 
@@ -556,6 +521,12 @@ noinst_LTLIBRARIES += \
 	libsystemd-shared.la
 
 libsystemd_shared_la_SOURCES = \
+	src/linux/auto_dev-ioctl.h \
+	src/linux/fanotify.h \
+	src/shared/list.h \
+	src/shared/macro.h \
+	src/shared/def.h \
+	src/shared/missing.h \
 	src/shared/util.c \
 	src/shared/util.h \
 	src/shared/virt.c \
@@ -583,10 +554,6 @@ 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/hostname-setup.c \
-	src/shared/hostname-setup.h \
 	src/shared/logs-show.c \
 	src/shared/logs-show.h \
 	src/shared/cgroup-show.c \
@@ -597,27 +564,42 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/utmp-wtmp.h \
 	src/shared/watchdog.c \
 	src/shared/watchdog.h \
-	src/shared/umount.c \
-	src/shared/umount.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-util.c \
-	src/shared/machine-id-util.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/spawn-polkit-agent.h
 
 libsystemd_shared_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
+#-------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-dbus.la
+
+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
+
+libsystemd_dbus_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+libsystemd_dbus_la_LIBADD = \
+	$(DBUS_LIBS)
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-label.la
@@ -632,7 +614,9 @@ libsystemd_label_la_SOURCES = \
 	src/shared/label.c \
 	src/shared/label.h \
 	src/shared/mkdir.c \
-	src/shared/mkdir.h
+	src/shared/mkdir.h \
+	src/shared/ask-password-api.c \
+	src/shared/ask-password-api.h
 
 libsystemd_label_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -690,10 +674,6 @@ noinst_LTLIBRARIES += \
 	libsystemd-core.la
 
 libsystemd_core_la_SOURCES = \
-	src/def.h \
-	src/missing.h \
-	src/linux/auto_dev-ioctl.h \
-	src/linux/fanotify.h \
 	src/core/unit.c \
 	src/core/unit.h \
 	src/core/job.c \
@@ -766,6 +746,8 @@ libsystemd_core_la_SOURCES = \
 	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 \
@@ -781,17 +763,11 @@ libsystemd_core_la_SOURCES = \
 	src/core/special.h \
 	src/core/bus-errors.h \
 	src/core/build.h \
-	src/core/ask-password-api.h \
-	src/core/sysfs-show.h \
-	src/core/polkit.h \
-	src/core/dbus-loop.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) \
@@ -805,6 +781,7 @@ libsystemd_core_la_LIBADD = \
 	libsystemd-capability.la \
 	libsystemd-label.la \
 	libsystemd-shared.la \
+	libsystemd-dbus.la \
 	libudev.la \
 	$(DBUS_LIBS) \
 	$(LIBWRAP_LIBS) \
@@ -813,6 +790,18 @@ 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/core/main.c
@@ -824,11 +813,51 @@ systemd_CFLAGS = \
 systemd_LDADD = \
 	libsystemd-core.la \
 	libsystemd-daemon.la \
-	libsystemd-id128.la
+	libsystemd-id128.la \
+	libsystemd-dbus.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) \
@@ -836,10 +865,11 @@ test_engine_CFLAGS = \
 
 test_engine_LDADD = \
 	libsystemd-core.la \
-	libsystemd-daemon.la
+	libsystemd-daemon.la \
+	libsystemd-dbus.la
 
 test_job_type_SOURCES = \
-	src/test-job-type.c
+	src/test/test-job-type.c
 
 test_job_type_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -849,51 +879,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/test/test-loopback.c
 
 test_loopback_LDADD = \
 	libsystemd-shared.la
 
 test_hostname_SOURCES = \
-	src/test-hostname.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/test/test-strv.c
 
 test_strv_LDADD = \
 	libsystemd-shared.la
 
 test_install_SOURCES = \
-	src/test-install.c
+	src/test/test-install.c
 
 test_install_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -904,7 +934,7 @@ test_install_LDADD = \
 	libsystemd-shared.la
 
 test_watchdog_SOURCES = \
-	src/test-watchdog.c
+	src/test/test-watchdog.c
 
 test_watchdog_LDADD = \
 	libsystemd-shared.la
@@ -920,6 +950,7 @@ systemd_initctl_CFLAGS = \
 systemd_initctl_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
+	libsystemd-dbus.la \
 	$(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -933,6 +964,7 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
 	libsystemd-shared.la \
+	libsystemd-dbus.la \
 	$(DBUS_LIBS) \
 	$(AUDIT_LIBS)
 
@@ -950,7 +982,9 @@ pkginclude_HEADERS += \
 
 # ------------------------------------------------------------------------------
 systemd_shutdown_SOURCES = \
-	src/shutdown.c
+	src/core/umount.c \
+	src/core/umount.h \
+	src/core/shutdown.c
 
 systemd_shutdown_LDADD = \
 	libsystemd-label.la \
@@ -979,7 +1013,7 @@ systemd_tmpfiles_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
-	src/machine-id-setup.c
+	src/machine-id-setup/machine-id-setup-main.c
 
 systemd_machine_id_setup_LDADD = \
 	libsystemd-label.la \
@@ -1003,6 +1037,7 @@ systemd_fsck_CFLAGS = \
 
 systemd_fsck_LDADD = \
 	libsystemd-shared.la \
+	libsystemd-dbus.la \
 	libudev.la \
 	$(DBUS_LIBS)
 
@@ -1061,6 +1096,7 @@ systemd_cgroups_agent_CFLAGS = \
 
 systemd_cgroups_agent_LDADD = \
 	libsystemd-shared.la \
+	libsystemd-dbus.la \
 	$(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1077,6 +1113,7 @@ systemctl_LDADD = \
 	libsystemd-daemon.la \
 	libsystemd-journal.la \
 	libsystemd-id128.la \
+	libsystemd-dbus.la \
 	$(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1090,8 +1127,7 @@ systemd_notify_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_ask_password_SOURCES = \
-	src/ask-password.c \
-	src/ask-password-api.c
+	src/ask-password.c
 
 systemd_ask_password_LDADD = \
 	libsystemd-label.la \
@@ -1130,15 +1166,14 @@ systemd_nspawn_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
-	src/bridge.c
+	src/stdio-bridge/stdio-bridge.c
 
 systemd_stdio_bridge_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
-	src/tty-ask-password-agent.c \
-	src/ask-password-api.c
+	src/tty-ask-password-agent.c
 
 systemd_tty_ask_password_agent_LDADD = \
 	libsystemd-label.la \
@@ -1146,7 +1181,7 @@ systemd_tty_ask_password_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 libsystemd_daemon_la_SOURCES = \
-	src/sd-daemon.c
+	src/libsystemd-daemon/sd-daemon.c
 
 libsystemd_daemon_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1157,7 +1192,7 @@ libsystemd_daemon_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-shared \
 	-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-	-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
+	-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
 
 pkginclude_HEADERS += \
 	src/systemd/sd-daemon.h
@@ -1185,7 +1220,7 @@ lib_LTLIBRARIES += \
 	libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
-	src/libsystemd-daemon.pc
+	src/libsystemd-daemon/libsystemd-daemon.pc
 
 MANPAGES += \
 	man/sd-daemon.7 \
@@ -1208,8 +1243,8 @@ man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
 
 EXTRA_DIST += \
-	src/libsystemd-daemon.pc.in \
-	src/libsystemd-daemon.sym
+	src/libsystemd-daemon/libsystemd-daemon.pc.in \
+	src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
 SUBDIRS += \
@@ -1594,6 +1629,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 \
@@ -1642,43 +1679,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
 
@@ -1843,7 +1882,7 @@ udevlibexec_PROGRAMS += \
 
 # ------------------------------------------------------------------------------
 libsystemd_id128_la_SOURCES = \
-	src/sd-id128.c
+	src/libsystemd-id128/sd-id128.c
 
 libsystemd_id128_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1853,13 +1892,13 @@ libsystemd_id128_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-shared \
 	-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-	-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
+	-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 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 \
@@ -1875,7 +1914,7 @@ lib_LTLIBRARIES += \
 	libsystemd-id128.la
 
 pkgconfiglib_DATA += \
-	src/libsystemd-id128.pc
+	src/libsystemd-id128/libsystemd-id128.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-id128-install-hook:
@@ -1897,8 +1936,8 @@ UNINSTALL_EXEC_HOOKS += \
 	libsystemd-id128-uninstall-hook
 
 EXTRA_DIST += \
-	src/libsystemd-id128.pc.in \
-	src/libsystemd-id128.sym
+	src/libsystemd-id128/libsystemd-id128.pc.in \
+	src/libsystemd-id128/libsystemd-id128.sym
 
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
@@ -2313,8 +2352,7 @@ dist_systemunit_DATA += \
 	units/cryptsetup.target
 
 systemd_cryptsetup_SOURCES = \
-	src/cryptsetup/cryptsetup.c \
-	src/ask-password-api.c
+	src/cryptsetup/cryptsetup.c
 
 systemd_cryptsetup_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2347,8 +2385,7 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
-	src/hostname/hostnamed.c \
-	src/polkit.c
+	src/hostname/hostnamed.c
 
 systemd_hostnamed_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2357,6 +2394,7 @@ systemd_hostnamed_CFLAGS = \
 systemd_hostnamed_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
+	libsystemd-dbus.la \
 	$(DBUS_LIBS)
 
 rootlibexec_PROGRAMS += \
@@ -2397,8 +2435,7 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
-	src/locale/localed.c \
-	src/polkit.c
+	src/locale/localed.c
 
 systemd_localed_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2408,6 +2445,7 @@ systemd_localed_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
+	libsystemd-dbus.la \
 	$(DBUS_LIBS)
 
 nodist_systemunit_DATA += \
@@ -2458,8 +2496,7 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
-	src/timedate/timedated.c \
-	src/polkit.c
+	src/timedate/timedated.c
 
 systemd_timedated_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2468,6 +2505,7 @@ systemd_timedated_CFLAGS = \
 systemd_timedated_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
+	libsystemd-dbus.la \
 	$(DBUS_LIBS)
 
 rootlibexec_PROGRAMS += \
@@ -2522,8 +2560,6 @@ systemd_logind_SOURCES = \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
-	src/dbus-loop.c \
-	src/polkit.c \
 	src/login/logind-acl.h
 
 nodist_systemd_logind_SOURCES = \
@@ -2538,6 +2574,7 @@ systemd_logind_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
+	libsystemd-dbus.la \
 	libudev.la \
 	$(DBUS_LIBS)
 
@@ -2569,6 +2606,7 @@ loginctl_CFLAGS = \
 
 loginctl_LDADD = \
 	libsystemd-shared.la \
+	libsystemd-dbus.la \
 	libudev.la \
 	$(DBUS_LIBS)
 
@@ -2825,10 +2863,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 $@
@@ -2843,16 +2877,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 = \
@@ -2892,11 +2931,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)