chiark / gitweb /
sysctl.d, binfmt.d, modules-load.d: switch to stacked config dirs in /lib, /etc,...
[elogind.git] / Makefile.am
index 8cc25306f5e49ec16c7556a36f577bb5591a1539..b4644fa75e7cd6b5c2d64c1f1f6ecfb3cb4776c2 100644 (file)
@@ -30,17 +30,17 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-userunitdir=$(pkgdatadir)/user
+userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 
 # And these are the special ones for /
 rootdir=@rootdir@
 rootbindir=$(rootdir)/bin
-rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
+systemgeneratordir=$(rootlibexecdir)/system-generators
+systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemunitdir=$(rootdir)/lib/systemd/system
-systemgeneratordir=$(rootdir)/lib/systemd/system-generators
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -57,11 +57,13 @@ AM_CPPFLAGS = \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-       -DRUNTIME_DIR=\"$(localstatedir)/run\" \
+       -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
+       -DRUNTIME_DIR=\"/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
+       -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -76,22 +78,50 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/usr/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_FRUGALWARE
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/usr/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+if TARGET_MANDRIVA
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+if TARGET_MEEGO
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"latarcyrheb-sun16\"
 endif
 endif
+endif
+endif
+endif
 
 rootbin_PROGRAMS = \
        systemd \
        systemctl \
        systemd-notify \
        systemd-ask-password \
-       systemd-tty-ask-password-agent
+       systemd-tty-ask-password-agent \
+       systemd-tmpfiles \
+       systemd-machine-id-setup
 
 bin_PROGRAMS = \
-       systemd-cgls
+       systemd-cgls \
+       systemd-stdio-bridge \
+       systemd-nspawn
+
+dist_bin_SCRIPTS = \
+       src/systemd-analyze
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -114,18 +144,24 @@ rootlibexec_PROGRAMS = \
        systemd-reply-password \
        systemd-readahead-collect \
        systemd-readahead-replay \
-       systemd-tmpfiles \
        systemd-user-sessions \
        systemd-fsck \
        systemd-quotacheck \
        systemd-timestamp \
-       systemd-ac-power
+       systemd-ac-power \
+       systemd-detect-virt \
+       systemd-sysctl \
+       systemd-binfmt \
+        systemd-hostnamed
+
+systemgenerator_PROGRAMS = \
+       systemd-getty-generator
 
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
        systemd-cryptsetup
 
-systemgenerator_PROGRAMS = \
+systemgenerator_PROGRAMS += \
        systemd-cryptsetup-generator
 endif
 
@@ -149,10 +185,12 @@ dist_pkgsysconf_DATA = \
        src/system.conf
 
 dist_dbuspolicy_DATA = \
-       src/org.freedesktop.systemd1.conf
+       src/org.freedesktop.systemd1.conf \
+        src/org.freedesktop.hostname1.conf
 
 dist_dbussystemservice_DATA = \
-       src/org.freedesktop.systemd1.service
+       src/org.freedesktop.systemd1.service \
+        src/org.freedesktop.hostname1.service
 
 dist_udevrules_DATA = \
        src/99-systemd.rules
@@ -173,13 +211,20 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Path.xml
 
 dist_bashcompletion_DATA = \
-        src/systemctl-bash-completion.sh
+       src/systemctl-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
        tmpfiles.d/x11.conf
 
+if HAVE_SYSV_COMPAT
+dist_tmpfiles_DATA += \
+       tmpfiles.d/legacy.conf
+endif
+
 dist_systemunit_DATA = \
+       units/graphical.target \
+       units/multi-user.target \
        units/emergency.service \
        units/emergency.target \
        units/sysinit.target \
@@ -188,6 +233,7 @@ dist_systemunit_DATA = \
        units/halt.target \
        units/kexec.target \
        units/local-fs.target \
+       units/cryptsetup.target \
        units/network.target \
        units/nss-lookup.target \
        units/mail-transfer-agent.target \
@@ -196,14 +242,13 @@ dist_systemunit_DATA = \
        units/reboot.target \
        units/rescue.target \
        units/rpcbind.target \
-       units/rtc-set.target \
+       units/time-sync.target \
        units/shutdown.target \
        units/final.target \
        units/umount.target \
        units/sigpwr.target \
        units/sockets.target \
        units/swap.target \
-       units/dbus.target \
        units/systemd-initctl.socket \
        units/systemd-logger.socket \
        units/systemd-shutdownd.socket \
@@ -218,30 +263,36 @@ dist_systemunit_DATA = \
        units/sys-kernel-debug.mount \
        units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
-       units/var-lock.mount \
        units/var-run.mount \
+       units/media.mount \
        units/hwclock-load.service \
        units/hwclock-save.service \
-       units/sysctl.service \
        units/remount-rootfs.service \
        units/printer.target \
+       units/sound.target \
        units/bluetooth.target \
        units/smartcard.target \
        units/systemd-readahead-done.timer \
        units/systemd-tmpfiles-clean.timer \
        units/quotaon.service \
        units/systemd-ask-password-wall.path \
-       units/systemd-ask-password-plymouth.path
+       units/systemd-ask-password-console.path \
+       units/syslog.target
+
+if HAVE_SYSV_COMPAT
+dist_systemunit_DATA += \
+       units/var-lock.mount
+endif
 
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
-       units/graphical.target \
+       units/console-shell.service \
        units/remote-fs.target \
-       units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
+       units/systemd-hostnamed.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
        units/systemd-vconsole-setup.service \
@@ -257,8 +308,9 @@ nodist_systemunit_DATA = \
        units/systemd-tmpfiles-clean.service \
        units/systemd-user-sessions.service \
        units/systemd-ask-password-wall.service \
-       units/systemd-ask-password-plymouth.service \
-       units/syslog.target \
+       units/systemd-ask-password-console.service \
+       units/systemd-sysctl.service \
+       units/systemd-binfmt.service \
        units/halt.service \
        units/poweroff.service \
        units/reboot.service \
@@ -279,13 +331,13 @@ nodist_userunit_DATA = \
 EXTRA_DIST = \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
-       units/graphical.target.m4 \
-       units/multi-user.target.m4 \
+       units/console-shell.service.m4 \
        units/remote-fs.target.m4 \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
+       units/systemd-hostnamed.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
        units/systemd-vconsole-setup.service.in \
@@ -301,8 +353,9 @@ EXTRA_DIST = \
        units/systemd-tmpfiles-clean.service.in \
        units/systemd-user-sessions.service.in \
        units/systemd-ask-password-wall.service.in \
-       units/systemd-ask-password-plymouth.service.in \
-       units/syslog.target.in \
+       units/systemd-ask-password-console.service.in \
+       units/systemd-sysctl.service.in \
+       units/systemd-binfmt.service.in \
        units/halt.service.in \
        units/poweroff.service.in \
        units/reboot.service.in \
@@ -311,30 +364,46 @@ EXTRA_DIST = \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/quotacheck.service.in \
-       systemd.pc.in
+       systemd.pc.in \
+       introspect.awk \
+       src/org.freedesktop.systemd1.policy.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/prefdm.service \
        units/fedora/rc-local.service \
-       units/fedora/halt-local.service \
-       units/fedora/plymouth-start.service \
-       units/fedora/plymouth-read-write.service \
-       units/fedora/plymouth-quit.service \
-       units/fedora/plymouth-reboot.service \
-       units/fedora/plymouth-kexec.service \
-       units/fedora/plymouth-poweroff.service \
-       units/fedora/plymouth-halt.service
+       units/fedora/halt-local.service
 endif
 
-if TARGET_GENTOO
+if TARGET_MANDRIVA
+dist_systemunit_DATA += \
+       units/mandriva/prefdm.service \
+       units/fedora/rc-local.service \
+       units/fedora/halt-local.service
+endif
+
+if TARGET_FRUGALWARE
 dist_systemunit_DATA += \
-       units/gentoo/xdm.service
+       units/frugalware/display-manager.service
 endif
 
-if TARGET_ARCH
+if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
-       units/arch/rc-local.service
+       units/plymouth-start.service \
+       units/plymouth-read-write.service \
+       units/plymouth-quit.service \
+       units/plymouth-quit-wait.service \
+       units/plymouth-reboot.service \
+       units/plymouth-kexec.service \
+       units/plymouth-poweroff.service \
+       units/plymouth-halt.service \
+       units/systemd-ask-password-plymouth.path
+
+nodist_systemunit_DATA += \
+       units/systemd-ask-password-plymouth.service
+
+EXTRA_DIST += \
+       units/systemd-ask-password-plymouth.service.in
 endif
 
 dist_doc_DATA = \
@@ -349,12 +418,16 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
-dist_polkitpolicy_DATA = \
+nodist_polkitpolicy_DATA = \
        src/org.freedesktop.systemd1.policy
 
+dist_polkitpolicy_DATA = \
+        src/org.freedesktop.hostname1.policy
+
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
-       libsystemd-core.la
+       libsystemd-core.la \
+       libsystemd-daemon.la
 
 libsystemd_basic_la_SOURCES = \
        src/util.c \
@@ -365,7 +438,8 @@ libsystemd_basic_la_SOURCES = \
        src/conf-parser.c \
        src/socket-util.c \
        src/log.c \
-       src/ratelimit.c
+       src/ratelimit.c \
+       src/exit-status.c
 
 libsystemd_basic_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -393,7 +467,6 @@ libsystemd_core_la_SOURCES = \
        src/load-dropin.c \
        src/execute.c \
        src/utmp-wtmp.c \
-       src/exit-status.c \
        src/dbus.c \
        src/dbus-manager.c \
        src/dbus-unit.c \
@@ -416,13 +489,15 @@ libsystemd_core_la_SOURCES = \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/locale-setup.c \
+       src/machine-id-setup.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
        src/namespace.c \
        src/tcpwrap.c \
        src/cgroup-util.c \
-       src/condition.c
+       src/condition.c \
+        src/dbus-common.c
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -440,6 +515,9 @@ libsystemd_core_la_LIBADD = \
        $(PAM_LIBS) \
        $(AUDIT_LIBS)
 
+libsystemd_daemon_la_SOURCES = \
+       src/sd-daemon.c
+
 # 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.
@@ -447,7 +525,9 @@ libsystemd_core_la_LIBADD = \
 EXTRA_DIST += \
        ${libsystemd_basic_la_SOURCES:.c=.h} \
        ${libsystemd_core_la_SOURCES:.c=.h} \
+       ${libsystemd_daemon_la_SOURCES:.c=.h} \
        src/macro.h \
+       src/def.h \
        src/ioprio.h \
        src/missing.h \
        src/list.h \
@@ -455,7 +535,6 @@ EXTRA_DIST += \
        src/linux/auto_dev-ioctl.h \
        src/linux/fanotify.h \
        src/initreq.h \
-       src/sd-daemon.h \
        src/sd-readahead.h \
        src/special.h \
        src/dbus-common.h \
@@ -472,6 +551,8 @@ MANPAGES = \
        man/systemctl.1 \
        man/systemadm.1 \
        man/systemd-cgls.1 \
+       man/systemd-nspawn.1 \
+       man/systemd-tmpfiles.8 \
        man/systemd-notify.1 \
        man/sd_notify.3 \
        man/sd_readahead.3 \
@@ -499,7 +580,17 @@ MANPAGES = \
        man/shutdown.8 \
        man/pam_systemd.8 \
        man/systemd.conf.5 \
-       man/tmpfiles.d.5
+       man/tmpfiles.d.5 \
+       man/hostname.5 \
+       man/machine-id.5 \
+       man/vconsole.conf.5 \
+       man/locale.conf.5 \
+       man/os-release.5 \
+        man/machine-info.5 \
+       man/modules-load.d.5 \
+       man/binfmt.d.5 \
+       man/sysctl.d.5 \
+        man/systemd-ask-password.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -587,11 +678,11 @@ test_hostname_LDADD = \
        libsystemd-basic.la
 
 test_daemon_SOURCES = \
-       src/test-daemon.c \
-       src/sd-daemon.c
+       src/test-daemon.c
 
 test_daemon_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
        src/test-cgroup.c \
@@ -613,7 +704,8 @@ test_env_replace_LDADD = \
        libsystemd-basic.la
 
 test_strv_SOURCES = \
-       src/test-strv.c
+       src/test-strv.c \
+       src/specifier.c
 
 test_strv_CFLAGS = \
        $(AM_CFLAGS)
@@ -623,16 +715,15 @@ test_strv_LDADD = \
 
 systemd_logger_SOURCES = \
        src/logger.c \
-       src/sd-daemon.c \
        src/tcpwrap.c
 
 systemd_logger_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(LIBWRAP_LIBS)
 
 systemd_initctl_SOURCES = \
        src/initctl.c \
-       src/sd-daemon.c \
        src/dbus-common.c
 
 systemd_initctl_CFLAGS = \
@@ -641,6 +732,7 @@ systemd_initctl_CFLAGS = \
 
 systemd_initctl_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(DBUS_LIBS)
 
 systemd_update_utmp_SOURCES = \
@@ -669,14 +761,27 @@ systemd_random_seed_LDADD = \
 
 systemd_shutdownd_SOURCES = \
        src/utmp-wtmp.c \
-       src/sd-daemon.c \
        src/shutdownd.c
 
 systemd_shutdownd_CFLAGS = \
        $(AM_CFLAGS)
 
 systemd_shutdownd_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-daemon.la
+
+systemd_hostnamed_SOURCES = \
+       src/hostnamed.c \
+        src/dbus-common.c
+
+systemd_hostnamed_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_hostnamed_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
 
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
@@ -709,6 +814,34 @@ systemd_tmpfiles_CFLAGS = \
 systemd_tmpfiles_LDADD = \
        libsystemd-basic.la
 
+systemd_machine_id_setup_SOURCES = \
+       src/machine-id-setup.c \
+       src/machine-id-main.c
+
+systemd_machine_id_setup_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_machine_id_setup_LDADD = \
+       libsystemd-basic.la
+
+systemd_sysctl_SOURCES = \
+       src/sysctl.c
+
+systemd_sysctl_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_sysctl_LDADD = \
+       libsystemd-basic.la
+
+systemd_binfmt_SOURCES = \
+       src/binfmt.c
+
+systemd_binfmt_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_binfmt_LDADD = \
+       libsystemd-basic.la
+
 systemd_fsck_SOURCES = \
        src/fsck.c \
        src/dbus-common.c
@@ -752,16 +885,27 @@ systemd_ac_power_LDADD = \
        libsystemd-basic.la \
        $(UDEV_LIBS)
 
+systemd_detect_virt_SOURCES = \
+       src/detect-virt.c
+
+systemd_detect_virt_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_detect_virt_LDADD = \
+       libsystemd-basic.la
+
 systemd_cryptsetup_SOURCES = \
        src/cryptsetup.c \
        src/ask-password-api.c
 
 systemd_cryptsetup_CFLAGS = \
        $(LIBCRYPTSETUP_CFLAGS) \
+       $(UDEV_CFLAGS) \
        $(AM_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
        $(LIBCRYPTSETUP_LIBS) \
+       $(UDEV_LIBS) \
        libsystemd-basic.la
 
 systemd_cryptsetup_generator_SOURCES = \
@@ -774,6 +918,16 @@ systemd_cryptsetup_generator_CFLAGS = \
 systemd_cryptsetup_generator_LDADD = \
        libsystemd-basic.la
 
+systemd_getty_generator_SOURCES = \
+       src/getty-generator.c \
+       src/unit-name.c
+
+systemd_getty_generator_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_getty_generator_LDADD = \
+       libsystemd-basic.la
+
 systemd_user_sessions_SOURCES = \
        src/user-sessions.c \
        src/cgroup-util.c
@@ -795,7 +949,8 @@ systemd_vconsole_setup_LDADD = \
 
 systemd_remount_api_vfs_SOURCES = \
        src/remount-api-vfs.c \
-       src/mount-setup.c
+       src/mount-setup.c \
+       src/exit-status.c
 
 systemd_remount_api_vfs_CFLAGS = \
        $(AM_CFLAGS)
@@ -817,21 +972,20 @@ systemd_cgroups_agent_LDADD = \
 
 systemd_kmsg_syslogd_SOURCES = \
        src/kmsg-syslogd.c \
-       src/sd-daemon.c \
        src/fdset.c
 
 systemd_kmsg_syslogd_CFLAGS = \
        $(AM_CFLAGS)
 
 systemd_kmsg_syslogd_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-daemon.la
 
 systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
        src/dbus-common.c \
        src/path-lookup.c \
-       src/sd-daemon.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
        src/exit-status.c \
@@ -843,15 +997,16 @@ systemctl_CFLAGS = \
 
 systemctl_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
        src/notify.c \
-       src/sd-daemon.c \
        src/sd-readahead.c
 
 systemd_notify_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-daemon.la
 
 systemd_ask_password_SOURCES = \
        src/ask-password.c \
@@ -868,7 +1023,6 @@ systemd_reply_password_LDADD = \
 
 systemd_readahead_collect_SOURCES = \
        src/readahead-collect.c \
-       src/sd-daemon.c \
        src/readahead-common.c
 
 systemd_readahead_collect_CFLAGS = \
@@ -876,11 +1030,11 @@ systemd_readahead_collect_CFLAGS = \
 
 systemd_readahead_collect_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(UDEV_LIBS)
 
 systemd_readahead_replay_SOURCES = \
        src/readahead-replay.c \
-       src/sd-daemon.c \
        src/readahead-common.c
 
 systemd_readahead_replay_CFLAGS = \
@@ -888,6 +1042,7 @@ systemd_readahead_replay_CFLAGS = \
 
 systemd_readahead_replay_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(UDEV_LIBS)
 
 systemd_cgls_SOURCES = \
@@ -901,13 +1056,29 @@ systemd_cgls_CFLAGS = \
 systemd_cgls_LDADD = \
        libsystemd-basic.la
 
+systemd_nspawn_SOURCES = \
+       src/nspawn.c \
+       src/cgroup-util.c
+
+systemd_nspawn_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_nspawn_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la
+
+systemd_stdio_bridge_SOURCES = \
+       src/bridge.c
+
+systemd_stdio_bridge_LDADD = \
+       libsystemd-basic.la
+
 systemadm_SOURCES = \
        src/systemadm.vala \
        src/systemd-interfaces.vala
 
 systemadm_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUSGLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        -Wno-unused-variable \
        -Wno-unused-function \
@@ -915,13 +1086,11 @@ systemadm_CFLAGS = \
        -Wno-format-nonliteral
 
 systemadm_VALAFLAGS = \
-       --pkg=dbus-glib-1 \
        --pkg=posix \
        --pkg=gtk+-2.0 \
        -g
 
 systemadm_LDADD = \
-       $(DBUSGLIB_LIBS) \
        $(GTK_LIBS)
 
 systemd_gnome_ask_password_agent_SOURCES = \
@@ -929,7 +1098,6 @@ systemd_gnome_ask_password_agent_SOURCES = \
 
 systemd_gnome_ask_password_agent_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUSGLIB_CFLAGS) \
        $(LIBNOTIFY_CFLAGS) \
        $(GTK_CFLAGS) \
        -Wno-unused-variable \
@@ -938,16 +1106,19 @@ systemd_gnome_ask_password_agent_CFLAGS = \
        -Wno-format-nonliteral
 
 systemd_gnome_ask_password_agent_VALAFLAGS = \
-       --pkg=dbus-glib-1 \
        --pkg=posix \
        --pkg=gtk+-2.0 \
        --pkg=linux \
        --pkg=gio-unix-2.0 \
-       --pkg=libnotify \
+       --pkg=libnotify
+if LIBNOTIFY07
+systemd_gnome_ask_password_agent_VALAFLAGS += \
+       -D LIBNOTIFY07
+endif
+systemd_gnome_ask_password_agent_VALAFLAGS += \
        -g
 
 systemd_gnome_ask_password_agent_LDADD = \
-       $(DBUSGLIB_LIBS) \
        $(LIBNOTIFY_LIBS) \
        $(GTK_LIBS)
 
@@ -961,8 +1132,7 @@ systemd_tty_ask_password_agent_LDADD = \
 
 pam_systemd_la_SOURCES = \
        src/pam-module.c \
-       src/cgroup-util.c \
-       src/sd-daemon.c
+       src/cgroup-util.c
 
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS)
@@ -977,18 +1147,21 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(PAM_LIBS)
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-                -e 's,@rootbindir\@,$(rootbindir),g' \
-               -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
+               -e 's,@rootbindir\@,$(rootbindir),g' \
+               -e 's,@bindir\@,$(bindir),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                -e 's,@systemunitdir\@,$(systemunitdir),g' \
+               -e 's,@userunitdir\@,$(userunitdir),g' \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
@@ -1004,6 +1177,9 @@ man/%: man/%.in Makefile
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
+src/%.policy: src/%.policy.in Makefile
+       $(SED_PROCESS)
+
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
@@ -1023,7 +1199,8 @@ CLEANFILES = \
        $(nodist_userunit_DATA) \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
-       $(pkgconfigdata_DATA)
+       $(pkgconfigdata_DATA) \
+       src/org.freedesktop.systemd1.policy
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1096,13 +1273,28 @@ CLEANFILES += \
        ${XML_IN_FILES:.xml.in=.html.in}
 endif
 
+DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+
 org.freedesktop.systemd1.%.xml: systemd
-       $(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@
+       $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
 CLEANFILES += \
        $(dbusinterface_DATA)
 
 install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(tmpfilesdir) \
+               $(DESTDIR)$(sysconfdir)/modules-load.d \
+               $(DESTDIR)$(prefix)/lib/modules-load.d \
+               $(DESTDIR)$(sysconfdir)/sysctl.d \
+               $(DESTDIR)$(prefix)/lib/sysctl.d \
+               $(DESTDIR)$(sysconfdir)/binfmt.d \
+               $(DESTDIR)$(prefix)/lib/binfmt.d \
+               $(DESTDIR)$(systemshutdowndir) \
+               $(DESTDIR)$(systemgeneratordir) \
+               $(DESTDIR)$(usergeneratordir)
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(userunitdir) \
@@ -1161,20 +1353,21 @@ install-data-hook:
                        fsck-root.service \
                        remount-rootfs.service \
                        var-run.mount \
-                       var-lock.mount && \
+                       media.mount && \
                $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
                $(LN_S) ../fsck-root.service fsck-root.service && \
                $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
                $(LN_S) ../var-run.mount var-run.mount && \
-               $(LN_S) ../var-lock.mount var-lock.mount )
+               $(LN_S) ../media.mount media.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
-               rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
+               rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.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 && \
                $(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
-               $(LN_S) $(systemunitdir)/printer.target printer.target)
+               $(LN_S) $(systemunitdir)/printer.target printer.target && \
+               $(LN_S) $(systemunitdir)/sound.target sound.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \
                $(LN_S) poweroff.target runlevel0.target && \
@@ -1185,9 +1378,10 @@ install-data-hook:
                $(LN_S) graphical.target runlevel5.target && \
                $(LN_S) reboot.target runlevel6.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f default.target ctrl-alt-del.target && \
+               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.hostname1.service && \
                $(LN_S) graphical.target default.target && \
-               $(LN_S) reboot.target ctrl-alt-del.target )
+               $(LN_S) reboot.target ctrl-alt-del.target && \
+                $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
                rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
                $(LN_S) ../getty.target getty.target && \
@@ -1201,10 +1395,6 @@ install-data-hook:
                $(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-               rm -f quotaon.service quotacheck.service && \
-               $(LN_S) $(systemunitdir)/quotacheck.service quotacheck.service && \
-               $(LN_S) $(systemunitdir)/quotaon.service quotaon.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
@@ -1221,7 +1411,11 @@ install-data-hook:
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
                        systemd-tmpfiles-setup.service \
-                       sysctl.service && \
+                       systemd-sysctl.service \
+                       systemd-binfmt.service \
+                       systemd-ask-password-console.path \
+                       systemd-kmsg-syslogd.service \
+                       cryptsetup.target && \
                $(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 && \
@@ -1231,35 +1425,32 @@ install-data-hook:
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
                $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
-               $(LN_S) ../sysctl.service sysctl.service )
+               $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
+               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
+               $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
+               $(LN_S) ../systemd-kmsg-syslogd.service && \
+               $(LN_S) ../cryptsetup.target cryptsetup.target )
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
                $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if TARGET_FEDORA
+if HAVE_PLYMOUTH
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
                $(DESTDIR)$(systemunitdir)/reboot.target.wants \
                $(DESTDIR)$(systemunitdir)/kexec.target.wants \
                $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
-               $(DESTDIR)$(systemunitdir)/halt.target.wants \
-               $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f rc-local.service && \
-               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
-       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-               rm -f halt-local.service && \
-               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+               $(DESTDIR)$(systemunitdir)/halt.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f plymouth-start.service systemd-ask-password-plymouth.path plymouth-read-write.service && \
+               rm -f plymouth-start.service plymouth-read-write.service && \
                $(LN_S) ../plymouth-start.service plymouth-start.service && \
-               $(LN_S) ../plymouth-read-write.service plymouth-read-write.service && \
-               $(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
+               $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f plymouth-quit.service  && \
-               $(LN_S) ../plymouth-quit.service plymouth-quit.service )
+               rm -f plymouth-quit.service plymouth-quit-wait.service && \
+               $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
+               $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
        ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
                rm -f plymouth-reboot.service && \
                $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
@@ -1272,27 +1463,69 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
                rm -f plymouth-halt.service && \
                $(LN_S) ../plymouth-halt.service plymouth-halt.service )
+endif
+if TARGET_MEEGO
+       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f network.target && \
+               $(LN_S) $(systemunitdir)/network.target network.target )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
+               rm -f * )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
+               rm -f * )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
+               rm -f * )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
+               rm -f * )
+endif
+
+if TARGET_FEDORA
+       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f rc-local.service && \
+               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+               rm -f halt-local.service && \
+               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service && \
-               $(LN_S) prefdm.service display-manager.service )
+               rm -f display-manager.service single.service && \
+               $(LN_S) prefdm.service display-manager.service && \
+               $(LN_S) rescue.service single.service )
        ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
-if TARGET_GENTOO
+
+if TARGET_MANDRIVA
+       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f rc-local.service && \
+               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+               rm -f halt-local.service && \
+               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service && \
-               $(LN_S) xdm.service display-manager.service )
+               rm -f display-manager.service dm.service single.service && \
+               $(LN_S) prefdm.service display-manager.service && \
+               $(LN_S) prefdm.service dm.service && \
+               $(LN_S) rescue.service single.service )
        ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
+
 if TARGET_DEBIAN_OR_UBUNTU
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f runlevel5.target && \
                $(LN_S) multi-user.target runlevel5.target )
 endif
 
+if HAVE_SYSV_COMPAT
+       ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
+               rm -f var-lock.mount && \
+               $(LN_S) ../var-lock.mount var-lock.mount )
+endif
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
@@ -1309,8 +1542,3 @@ upload: all distcheck
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
-
-# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
-fedora: install
-       rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
-       rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount