X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=b444c02f3026e6ce37ed464866675e07b530d7c2;hp=973c08e4cee4a4a6fa08e7d056c3ac8946a059c4;hb=f3d4cc01488e4b7acf05da02b487f93ae9744337;hpb=5e6afdd3d359fc42de7ac432243e98673577e81f

diff --git a/Makefile.am b/Makefile.am
index 973c08e4c..b444c02f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,37 +17,55 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+# Dirs of external packages
+dbuspolicydir=@dbuspolicydir@
+dbussessionservicedir=@dbussessionservicedir@
+dbussystemservicedir=@dbussystemservicedir@
+dbusinterfacedir=@dbusinterfacedir@
 udevrulesdir=@udevrulesdir@
+pamlibdir=@pamlibdir@
+pkgconfigdatadir=$(datadir)/pkgconfig
 
+# Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-systemunitdir=$(pkgdatadir)/system
 sessionunitdir=$(pkgdatadir)/session
 
+# And these are the special ones for /
+rootdir=@rootdir@
+rootbindir=$(rootdir)/bin
+rootlibexecdir=$(rootdir)/lib/systemd
+systemunitdir=$(rootdir)/lib/systemd/system
+
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
+	-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
 	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
 	-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
 	-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
 	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
+	-DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
 	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
 	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-	-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
-	-DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\" \
+	-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
+	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
+	-DRUNTIME_DIR=\"$(localstatedir)/run\" \
 	-I $(top_srcdir)/src
 
-sbin_PROGRAMS = \
-	systemd
+rootbin_PROGRAMS = \
+	systemd \
+	systemctl \
+	systemd-notify
 
 bin_PROGRAMS = \
-	systemctl
+	systemd-install
 
 if HAVE_GTK
 bin_PROGRAMS += \
 	systemadm
 endif
 
-pkglibexec_PROGRAMS = \
+rootlibexec_PROGRAMS = \
 	systemd-logger \
 	systemd-cgroups-agent \
 	systemd-initctl
@@ -56,24 +74,53 @@ noinst_PROGRAMS = \
 	test-engine \
 	test-job-type \
 	test-ns \
-	test-loopback
+	test-loopback \
+	test-daemon \
+	test-cgroup
+
+if HAVE_PAM
+pamlib_LTLIBRARIES = \
+	pam_systemd.la
+endif
+
+dist_pkgsysconf_DATA = \
+	src/system.conf
 
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.conf
 
+dist_dbussystemservice_DATA = \
+	src/org.freedesktop.systemd1.service
+
 dist_udevrules_DATA = \
 	src/99-systemd.rules
 
+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_systemunit_DATA = \
 	units/emergency.service \
+	units/basic.target \
 	units/getty.target \
 	units/halt.target \
 	units/local-fs.target \
 	units/network.target \
 	units/nss-lookup.target \
+	units/mail-transfer-agent.target \
 	units/poweroff.target \
 	units/reboot.target \
-	units/remote-fs.target \
 	units/rescue.target \
 	units/rpcbind.target \
 	units/rtc-set.target \
@@ -82,27 +129,50 @@ dist_systemunit_DATA = \
 	units/sockets.target \
 	units/swap.target \
 	units/systemd-initctl.socket \
-	units/systemd-logger.socket
-
-systemunit_DATA = \
-	units/basic.target \
+	units/systemd-logger.socket \
+	units/dev-hugepages.automount \
+	units/dev-hugepages.mount \
+	units/dev-mqueue.automount \
+	units/dev-mqueue.mount \
+	units/proc-sys-fs-binfmt_misc.automount \
+	units/proc-sys-fs-binfmt_misc.mount \
+	units/sys-kernel-debug.automount \
+	units/sys-kernel-debug.mount \
+	units/sys-kernel-security.automount \
+	units/sys-kernel-security.mount \
+	units/var-lock.mount \
+	units/var-run.mount
+
+nodist_systemunit_DATA = \
+	units/sysinit.target \
 	units/getty@.service \
 	units/graphical.target \
+	units/remote-fs.target \
 	units/multi-user.target \
 	units/systemd-initctl.service \
 	units/systemd-logger.service \
-	units/syslog.target
+	units/syslog.target \
+	units/dbus.target
+
+dist_sessionunit_DATA = \
+	units/session/default.target
+
+nodist_sessionunit_DATA = \
+	units/session/remote-fs.target \
+	units/session/exit.service
 
 EXTRA_DIST = \
-	units/basic.target.m4 \
+	units/sysinit.target.m4 \
 	units/getty@.service.m4 \
 	units/graphical.target.m4 \
 	units/multi-user.target.m4 \
+	units/remote-fs.target.m4 \
 	units/systemd-initctl.service.in \
 	units/systemd-logger.service.in \
 	units/syslog.target.in \
-	LICENSE \
-	README
+	units/dbus.target.in \
+	units/session/exit.service.in \
+	systemd.pc.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -115,10 +185,46 @@ dist_systemunit_DATA += \
 	units/fedora/sysinit.service
 endif
 
-# This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs.  We therefore can't
-# list the .h files as dependencies if we want make dist to work.
-BASIC_SOURCES = \
+if TARGET_SUSE
+dist_systemunit_DATA += \
+	units/suse/halt.service \
+	units/suse/poweroff.service \
+	units/suse/reboot.service
+endif
+
+if TARGET_GENTOO
+dist_systemunit_DATA += \
+	units/gentoo/halt.service \
+	units/gentoo/killall.service \
+	units/gentoo/poweroff.service \
+	units/gentoo/reboot.service \
+	units/gentoo/xdm.service
+endif
+
+if TARGET_ARCH
+dist_systemunit_DATA += \
+	units/arch/sysinit.service \
+	units/arch/rc-local.service \
+	units/arch/halt.service \
+	units/arch/poweroff.service \
+	units/arch/reboot.service
+endif
+
+dist_doc_DATA = \
+	README \
+	LICENSE \
+	DISTRO_PORTING \
+	src/sd-daemon.h \
+	src/sd-daemon.c
+
+pkgconfigdata_DATA = \
+	systemd.pc
+
+noinst_LTLIBRARIES = \
+	libsystemd-basic.la \
+	libsystemd-core.la
+
+libsystemd_basic_la_SOURCES = \
         src/util.c \
         src/hashmap.c \
         src/set.c \
@@ -128,11 +234,11 @@ BASIC_SOURCES = \
         src/log.c \
         src/ratelimit.c
 
-COMMON_SOURCES = \
-	$(BASIC_SOURCES) \
+libsystemd_core_la_SOURCES = \
 	src/unit.c \
         src/job.c \
         src/manager.c \
+	src/path-lookup.c \
         src/load-fragment.c \
         src/service.c \
         src/automount.c \
@@ -143,6 +249,7 @@ COMMON_SOURCES = \
         src/snapshot.c \
         src/socket.c \
         src/timer.c \
+	src/path.c \
         src/load-dropin.c \
         src/execute.c \
         src/dbus.c \
@@ -151,6 +258,7 @@ COMMON_SOURCES = \
         src/dbus-job.c \
 	src/dbus-service.c \
 	src/dbus-socket.c \
+	src/dbus-timer.c \
 	src/dbus-target.c \
 	src/dbus-mount.c \
 	src/dbus-automount.c \
@@ -158,18 +266,42 @@ COMMON_SOURCES = \
 	src/dbus-snapshot.c \
 	src/dbus-device.c \
 	src/dbus-execute.c \
+	src/dbus-path.c \
 	src/cgroup.c \
 	src/mount-setup.c \
 	src/hostname-setup.c \
 	src/loopback-setup.c \
+	src/kmod-setup.c \
+	src/modprobe-setup.c \
 	src/utmp-wtmp.c \
 	src/specifier.c \
 	src/unit-name.c \
 	src/fdset.c \
-	src/namespace.c
+	src/namespace.c \
+	src/tcpwrap.c \
+	src/cgroup-util.c
+
+libsystemd_core_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(UDEV_CFLAGS) \
+	$(CGROUP_CFLAGS)
+
+libsystemd_core_la_LIBADD = \
+	libsystemd-basic.la \
+	$(DBUS_LIBS) \
+	$(UDEV_LIBS) \
+	$(CGROUP_LIBS) \
+	$(LIBWRAP_LIBS) \
+	$(PAM_LIBS)
+
+# This is needed because automake is buggy in how it generates the
+# rules for C programs, but not Vala programs.  We therefore can't
+# list the .h files as dependencies if we want make dist to work.
 
 EXTRA_DIST += \
-	${COMMON_SOURCES:.c=.h} \
+	${libsystemd_basic_la_SOURCES:.c=.h} \
+	${libsystemd_core_la_SOURCES:.c=.h} \
 	src/macro.h \
 	src/ioprio.h \
 	src/missing.h \
@@ -177,204 +309,386 @@ EXTRA_DIST += \
 	src/securebits.h \
 	src/linux/auto_dev-ioctl.h \
 	src/initreq.h \
-	src/sd-daemon.h
-
-dist_man_MANS = \
+	src/sd-daemon.h \
+	src/special.h \
+	src/dbus-common.h
+
+MANPAGES = \
+	man/systemd.1 \
+	man/systemctl.1 \
+	man/systemadm.1 \
+	man/systemd-install.1 \
+	man/systemd-notify.1 \
+	man/sd_notify.3 \
+	man/sd_booted.3 \
+	man/sd_listen_fds.3 \
+	man/sd_is_fifo.3 \
 	man/systemd.unit.5 \
 	man/systemd.service.5 \
+	man/systemd.socket.5 \
+	man/systemd.mount.5 \
+	man/systemd.automount.5 \
+	man/systemd.swap.5 \
+	man/systemd.timer.5 \
+	man/systemd.path.5 \
+	man/systemd.target.5 \
+	man/systemd.device.5 \
+	man/systemd.snapshot.5 \
+	man/systemd.exec.5 \
+	man/daemon.7 \
+	man/sd-daemon.7 \
+	man/runlevel.8 \
+	man/telinit.8 \
+	man/halt.8 \
+	man/shutdown.8 \
+	man/pam_systemd.8 \
+	man/systemd.conf.5
+
+MANPAGES_ALIAS = \
+	man/reboot.8 \
+	man/poweroff.8 \
+	man/sd_is_socket.3 \
+	man/sd_is_socket_unix.3 \
+	man/sd_is_socket_inet.3 \
+	man/sd_notifyf.3 \
+	man/init.1
+
+man/reboot.8: man/halt.8
+man/poweroff.8: man/halt.8
+man/sd_is_socket.3: man/sd_is_fifo.3
+man/sd_is_socket_unix.3: man/sd_is_fifo.3
+man/sd_is_socket_inet.3: man/sd_is_fifo.3
+man/sd_notifyf.3: man/sd_notify.3
+man/init.1: man/systemd.1
+
+dist_man_MANS = \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
+
+nodist_man_MANS = \
 	man/systemd.special.7
 
-HTMLMANS = \
-	man/systemd.unit.html \
-	man/systemd.service.html \
-	man/systemd.special.html
+XML_FILES = \
+	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
+
+XML_IN_FILES = \
+	${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}}
 
 dist_noinst_DATA = \
-	$(HTMLMANS)
+	${XML_FILES:.xml=.html}
+
+nodist_noinst_DATA = \
+	${XML_IN_FILES:.xml.in=.html}
 
 EXTRA_DIST += \
-	man/systemd.unit.xml \
-	man/systemd.service.xml \
-	man/systemd.special.xml
+	$(XML_FILES) \
+	$(XML_IN_FILES) \
+	${nodist_man_MANS:=.in} \
+	${XML_IN_FILES:.xml.in=.html.in}
 
 systemd_SOURCES = \
-	$(COMMON_SOURCES) \
 	src/main.c
 
-systemd_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+systemd_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(UDEV_CFLAGS) \
 	$(CGROUP_CFLAGS)
 
 systemd_LDADD = \
-	$(DBUS_LIBS) \
-	$(UDEV_LIBS) \
-	$(CGROUP_LIBS)
+	libsystemd-core.la
 
 test_engine_SOURCES = \
-	$(COMMON_SOURCES) \
 	src/test-engine.c
 
-test_engine_CPPFLAGS = $(systemd_CPPFLAGS)
+test_engine_CFLAGS = $(systemd_CFLAGS)
 test_engine_LDADD = $(systemd_LDADD)
 
 test_job_type_SOURCES = \
-	$(COMMON_SOURCES) \
-	src/test-engine.c
+	src/test-job-type.c
 
-test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
+test_job_type_CFLAGS = $(systemd_CFLAGS)
 test_job_type_LDADD = $(systemd_LDADD)
 
 test_ns_SOURCES = \
-	$(BASIC_SOURCES) \
-	src/test-ns.c \
-	src/namespace.c
+	src/test-ns.c
 
-test_ns_CPPFLAGS = $(systemd_CPPFLAGS)
+test_ns_CFLAGS = $(systemd_CFLAGS)
 test_ns_LDADD = $(systemd_LDADD)
 
 test_loopback_SOURCES = \
-	$(BASIC_SOURCES) \
 	src/test-loopback.c \
 	src/loopback-setup.c
 
-test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
-test_loopback_LDADD = $(systemd_LDADD)
+test_loopback_LDADD = \
+	libsystemd-basic.la
+
+test_daemon_SOURCES = \
+	src/test-daemon.c \
+	src/sd-daemon.c
+
+test_daemon_LDADD = \
+	libsystemd-basic.la
+
+test_cgroup_SOURCES = \
+	src/test-cgroup.c \
+	src/cgroup-util.c
+
+test_cgroup_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(CGROUP_CFLAGS)
+
+test_cgroup_LDADD = \
+	libsystemd-basic.la \
+	$(CGROUP_LIBS)
 
 systemd_logger_SOURCES = \
-	$(BASIC_SOURCES) \
 	src/logger.c \
-	src/sd-daemon.c
+	src/sd-daemon.c \
+	src/tcpwrap.c
+
+systemd_logger_LDADD = \
+	libsystemd-basic.la \
+	$(LIBWRAP_LIBS)
 
 systemd_initctl_SOURCES = \
-	$(BASIC_SOURCES) \
 	src/initctl.c \
-	src/sd-daemon.c
+	src/sd-daemon.c \
+	src/dbus-common.c
 
-systemd_initctl_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+systemd_initctl_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 systemd_initctl_LDADD = \
+	libsystemd-basic.la \
 	$(DBUS_LIBS)
 
 systemd_cgroups_agent_SOURCES = \
-	$(BASIC_SOURCES) \
 	src/cgroups-agent.c
 
-systemd_cgroups_agent_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+systemd_cgroups_agent_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 systemd_cgroups_agent_LDADD = \
+	libsystemd-basic.la \
 	$(DBUS_LIBS)
 
-VALAFLAGS = \
-	-g \
-	--save-temps \
-	--pkg=dbus-glib-1 \
-	--pkg=posix
+systemctl_SOURCES = \
+	src/systemctl.c \
+	src/utmp-wtmp.c \
+	src/dbus-common.c
 
-if HAVE_GTK
-VALAFLAGS += \
-	--pkg=gtk+-2.0
-endif
+systemctl_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
 
-VALA_CFLAGS = \
-	-Wno-unused-variable \
-	-Wno-unused-function
+systemctl_LDADD = \
+	libsystemd-basic.la \
+	$(DBUS_LIBS)
 
-systemctl_SOURCES = \
-	src/systemctl.vala \
-	src/systemd-interfaces.vala
+systemd_notify_SOURCES = \
+	src/notify.c \
+	src/sd-daemon.c
+
+systemd_notify_LDADD = \
+	libsystemd-basic.la
+
+systemd_install_SOURCES = \
+	src/install.c \
+	src/path-lookup.c \
+	src/dbus-common.c
 
-systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
-systemctl_LDADD = $(DBUSGLIB_LIBS)
+systemd_install_LDADD = \
+	libsystemd-basic.la \
+	$(DBUS_LIBS)
+
+systemd_install_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
 
 systemadm_SOURCES = \
 	src/systemadm.vala \
 	src/systemd-interfaces.vala
 
-systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
-systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
+systemadm_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUSGLIB_CFLAGS) \
+	$(GTK_CFLAGS) \
+	-Wno-unused-variable \
+	-Wno-unused-function \
+	-Wno-shadow \
+	-Wno-format-nonliteral
+
+systemadm_VALAFLAGS = \
+	--pkg=dbus-glib-1 \
+	--pkg=posix \
+	--pkg=gtk+-2.0 \
+	-g
+
+systemadm_LDADD = \
+	$(DBUSGLIB_LIBS) \
+	$(GTK_LIBS)
+
+pam_systemd_la_SOURCES = \
+	src/pam-module.c \
+	src/cgroup-util.c \
+	src/sd-daemon.c
+
+pam_systemd_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(CGROUP_CFLAGS) \
+	-fvisibility=hidden
+
+pam_systemd_la_LDFLAGS = \
+	-module \
+	-export-dynamic \
+	-avoid-version \
+	-shared \
+	-export-symbols-regex '^pam_sm_.*'
+
+pam_systemd_la_LIBADD = \
+	libsystemd-basic.la \
+	$(PAM_LIBS) \
+	$(CGROUP_LIBS)
 
 SED_PROCESS = \
-	$(MKDIR_P) units && \
-	$(SED)  -e 's,@libexecdir\@,$(libexecdir),g' \
-		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
 		-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
+		-e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
+		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
+		-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+		-e 's,@systemunitdir\@,$(systemunitdir),g' \
+		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
+		-e 's,@prefix\@,$(prefix),g' \
 		< $< > $@
 
-units/systemd-initctl.service: units/systemd-initctl.service.in Makefile
+units/%: units/%.in Makefile
 	$(SED_PROCESS)
 
-units/systemd-logger.service: units/systemd-logger.service.in Makefile
+man/%: man/%.in Makefile
 	$(SED_PROCESS)
 
-units/syslog.target: units/syslog.target.in Makefile
+%.pc: %.pc.in Makefile
 	$(SED_PROCESS)
 
-M4_FLAGS =
+M4_PROCESS_SYSTEM = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
 
-if TARGET_FEDORA
-M4_FLAGS += -DTARGET_FEDORA=1
+M4_PROCESS_SESSION = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@
+
+units/%: units/%.m4 Makefile
+	$(M4_PROCESS_SYSTEM)
+
+units/session/%: units/%.m4 Makefile
+	$(M4_PROCESS_SESSION)
+
+CLEANFILES = \
+	$(nodist_systemunit_DATA) \
+	$(nodist_sessionunit_DATA) \
+	$(nodist_man_MANS) \
+	${XML_IN_FILES:.xml.in=.html} \
+	$(pkgconfigdata_DATA)
+
+if HAVE_VALAC
+CLEANFILES += \
+	${systemadm_SOURCES:.vala=.c}
 endif
 
-M4_PROCESS = \
-	$(MKDIR_P) units && \
-	$(M4) -P $(M4_FLAGS) < $< > $@
+if HAVE_XSLTPROC
+XSLTPROC_FLAGS = \
+	--nonet \
+	--param funcsynopsis.style "'ansi'"
 
-units/basic.target: units/basic.target.m4 Makefile
-	$(M4_PROCESS)
+XSLTPROC_PROCESS_MAN = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-units/graphical.target: units/graphical.target.m4 Makefile
-	$(M4_PROCESS)
+XSLTPROC_PROCESS_MAN_IN = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
+	mv ${@:.in=} $@
 
-units/multi-user.target: units/multi-user.target.m4 Makefile
-	$(M4_PROCESS)
+XSLTPROC_PROCESS_HTML = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
-units/getty@.service: units/getty@.service.m4 Makefile
-	$(M4_PROCESS)
+XSLTPROC_PROCESS_HTML_IN = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
+	mv ${@:.in=} $@
 
-CLEANFILES = \
-	src/systemd-interfaces.c \
-	src/systemctl.c \
-	src/systemadm.c \
-	units/systemd-initctl.service \
-	units/systemd-logger.service \
-	units/syslog.target \
-	units/basic.target \
-	units/getty@.service \
-	units/graphical.target \
-	units/multi-user.target
+man/%.1: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
 
-if HAVE_XSLTPROC
-man/%.5 man/%.7: man/%.xml
-	$(MKDIR_P) man
-	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+man/%.1.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.3: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.3.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.5: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.5.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.7: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.7.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_MAN_IN)
+
+man/%.8: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.8.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_MAN_IN)
 
 man/%.html: man/%.xml
-	$(MKDIR_P) man
-	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+	$(XSLTPROC_PROCESS_HTML)
+
+man/%.html.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_HTML_IN)
 
 CLEANFILES += \
 	$(dist_man_MANS) \
-	$(HTMLMANS)
+	${nodist_man_MANS:=.in} \
+	${XML_FILES:.xml=.html} \
+	${XML_IN_FILES:.xml.in=.html.in}
 endif
 
+org.freedesktop.systemd1.%.xml: systemd
+	$(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
+
+CLEANFILES += \
+	$(dbusinterface_DATA)
+
 install-data-hook:
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(systemunitdir) \
 		$(DESTDIR)$(sessionunitdir) \
 		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
+		$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system \
 		$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/session \
-		$(DESTDIR)$(sysconfdir)/xdg/systemd \
-		$(DESTDIR)/cgroup/debug
+		$(DESTDIR)$(sysconfdir)/xdg/systemd
+	$(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \
+		echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway."
 	( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
 		rm -f session && \
 		$(LN_S) $(pkgsysconfdir)/session session )
@@ -383,9 +697,11 @@ install-data-hook:
 		$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
 		$(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
 	( cd $(DESTDIR)$(sessionunitdir) && \
-		rm -f shutdown.target sockets.target && \
-		$(LN_S) ../system/shutdown.target shutdown.target && \
-		$(LN_S) ../system/sockets.target sockets.target )
+		rm -f shutdown.target sockets.target local-fs.target swap.target && \
+		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
+		$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
+		$(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
+		$(LN_S) $(systemunitdir)/swap.target swap.target )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f runlevel0.target runlevel1.target runlevel6.target && \
 		$(LN_S) poweroff.target runlevel0.target && \
@@ -410,20 +726,55 @@ install-data-hook:
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-		rm -f getty.target && \
-		$(LN_S) $(systemunitdir)/getty.target getty.target )
+		rm -f getty.target remote-fs.target && \
+		$(LN_S) $(systemunitdir)/getty.target getty.target && \
+		$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
+	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+		rm -f dev-hugepages.automount \
+			dev-mqueue.automount \
+			proc-sys-fs-binfmt_misc.automount \
+			sys-kernel-debug.automount \
+			sys-kernel-security.automount && \
+		$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
+		$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
+		$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
+		$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
+		$(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount )
+	( cd $(DESTDIR)$(dbussessionservicedir) && \
+		rm -f org.freedesktop.systemd1.service && \
+		$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 if TARGET_FEDORA
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH)
+	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+		rm -f display-manager.service && \
+		$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
 		rm -f prefdm.service && \
-		$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
+		$(LN_S) ../prefdm.service prefdm.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
 		rm -f rc-local.service && \
 		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f local.service && \
 		$(LN_S) rc-local.service local.service )
+	( cd $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) && \
+		$(LN_S) halt reboot > /dev/null 2>&1 || true )
+endif
+if TARGET_GENTOO
+	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+		rm -f display-manager.service && \
+		$(LN_S) $(systemunitdir)/xdm.service display-manager.service )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
+		rm -f prefdm.service && \
+		$(LN_S) ../prefdm.service prefdm.service )
 endif
-
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
+	--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-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
+	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
+	--with-rootdir=$$dc_install_base/$(rootdir)