udevrulesdir=@udevrulesdir@
pamlibdir=@pamlibdir@
pkgconfigdatadir=$(datadir)/pkgconfig
+polkitpolicydir=$(datadir)/polkit-1/actions
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
systemunitdir=$(rootdir)/lib/systemd/system
AM_CPPFLAGS = \
- -include $(top_builddir)/config.h \
+ -include $(top_builddir)/config.h \
-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-I $(top_srcdir)/src
+if TARGET_GENTOO
+AM_CPPFLAGS += \
+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+AM_CPPFLAGS += \
+ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+ -DKBD_SETFONT=\"/bin/setfont\" \
+ -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+endif
+
rootbin_PROGRAMS = \
systemd \
systemctl \
- systemd-notify
+ systemd-notify \
+ systemd-ask-password
bin_PROGRAMS = \
systemd-cgls
if HAVE_GTK
bin_PROGRAMS += \
- systemadm
+ systemadm \
+ systemd-ask-password-agent
endif
rootlibexec_PROGRAMS = \
systemd-update-utmp \
systemd-random-seed \
systemd-shutdownd \
- systemd-auto-console-getty
+ systemd-modules-load \
+ systemd-remount-api-vfs \
+ systemd-kmsg-syslogd \
+ systemd-vconsole-setup \
+ systemd-reply-password \
+ systemd-readahead-collect \
+ systemd-readahead-replay
noinst_PROGRAMS = \
test-engine \
test-job-type \
test-ns \
test-loopback \
+ test-hostname \
test-daemon \
test-cgroup \
test-env-replace
units/network.target \
units/nss-lookup.target \
units/mail-transfer-agent.target \
+ units/http-daemon.target \
units/poweroff.target \
units/reboot.target \
units/rescue.target \
units/systemd-initctl.socket \
units/systemd-logger.socket \
units/systemd-shutdownd.socket \
- units/systemd-auto-console-getty.service \
+ units/systemd-kmsg-syslogd.socket \
units/dev-hugepages.automount \
units/dev-hugepages.mount \
units/dev-mqueue.automount \
units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
units/tmp.mount \
+ units/tmp.service \
units/var-lock.mount \
units/var-lock.service \
units/var-run.mount \
units/hwclock-load.service \
units/hwclock-save.service \
units/sysctl.service \
+ units/remount-rootfs.service \
units/printer.target \
units/bluetooth.target \
- units/smartcard.target
+ units/smartcard.target \
+ units/tmpwatch.service \
+ units/tmpwatch.timer
nodist_systemunit_DATA = \
units/sysinit.target \
units/getty@.service \
+ units/serial-getty@.service \
units/graphical.target \
units/remote-fs.target \
units/multi-user.target \
units/systemd-initctl.service \
units/systemd-logger.service \
units/systemd-shutdownd.service \
- units/systemd-auto-console-getty.service \
+ units/systemd-kmsg-syslogd.service \
+ units/systemd-modules-load.service \
+ units/systemd-vconsole-setup.service \
+ units/systemd-remount-api-vfs.service \
units/systemd-update-utmp-runlevel.service \
units/systemd-update-utmp-shutdown.service \
units/systemd-random-seed-save.service \
EXTRA_DIST = \
units/sysinit.target.m4 \
units/getty@.service.m4 \
+ units/serial-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/systemd-shutdownd.service.in \
- units/systemd-auto-console-getty.service.in \
+ units/systemd-kmsg-syslogd.service.in \
+ units/systemd-modules-load.service.in \
+ units/systemd-vconsole-setup.service.in \
+ units/systemd-remount-api-vfs.service.in \
units/systemd-update-utmp-runlevel.service.in \
units/systemd-update-utmp-shutdown.service.in \
units/systemd-random-seed-save.service.in \
units/fedora/plymouth-halt.service
endif
+if TARGET_DEBIAN
+dist_systemunit_DATA += \
+ units/debian/halt.service \
+ units/debian/killall.service \
+ units/debian/poweroff.service \
+ units/debian/reboot.service \
+ units/debian/fsck.target \
+ units/debian/umountfs.service \
+ units/debian/umountnfs.service \
+ units/debian/umountroot.service
+endif
+
if TARGET_SUSE
dist_systemunit_DATA += \
units/suse/halt.service \
pkgconfigdata_DATA = \
systemd.pc
+dist_polkitpolicy_DATA = \
+ src/org.freedesktop.systemd1.policy
+
noinst_LTLIBRARIES = \
libsystemd-basic.la \
libsystemd-core.la
libsystemd_basic_la_SOURCES = \
- src/util.c \
+ src/util.c \
src/label.c \
- src/hashmap.c \
- src/set.c \
- src/strv.c \
- src/conf-parser.c \
- src/socket-util.c \
- src/log.c \
- src/ratelimit.c
+ src/hashmap.c \
+ src/set.c \
+ src/strv.c \
+ src/conf-parser.c \
+ src/socket-util.c \
+ src/log.c \
+ src/ratelimit.c
libsystemd_basic_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_core_la_SOURCES = \
src/unit.c \
- src/job.c \
- src/manager.c \
+ src/job.c \
+ src/manager.c \
src/path-lookup.c \
- src/load-fragment.c \
- src/service.c \
- src/automount.c \
- src/mount.c \
- src/swap.c \
- src/device.c \
- src/target.c \
- src/snapshot.c \
- src/socket.c \
- src/timer.c \
+ src/load-fragment.c \
+ src/service.c \
+ src/automount.c \
+ src/mount.c \
+ src/swap.c \
+ src/device.c \
+ src/target.c \
+ src/snapshot.c \
+ src/socket.c \
+ src/timer.c \
src/path.c \
- src/load-dropin.c \
- src/execute.c \
- src/dbus.c \
- src/dbus-manager.c \
- src/dbus-unit.c \
- src/dbus-job.c \
+ src/load-dropin.c \
+ src/execute.c \
+ src/exit-status.c \
+ src/dbus.c \
+ src/dbus-manager.c \
+ src/dbus-unit.c \
+ src/dbus-job.c \
src/dbus-service.c \
src/dbus-socket.c \
src/dbus-timer.c \
src/hostname-setup.c \
src/loopback-setup.c \
src/kmod-setup.c \
+ src/locale-setup.c \
src/specifier.c \
src/unit-name.c \
src/fdset.c \
test_loopback_LDADD = \
libsystemd-basic.la
+test_hostname_SOURCES = \
+ src/test-hostname.c \
+ src/hostname-setup.c
+
+test_hostname_LDADD = \
+ libsystemd-basic.la
+
test_daemon_SOURCES = \
src/test-daemon.c \
src/sd-daemon.c
systemd_shutdownd_LDADD = \
libsystemd-basic.la
-systemd_auto_console_getty_SOURCES = \
- src/auto-console-getty.c \
- src/dbus-common.c
+systemd_modules_load_SOURCES = \
+ src/modules-load.c
-systemd_auto_console_getty_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+systemd_modules_load_CFLAGS = \
+ $(AM_CFLAGS)
-systemd_auto_console_getty_LDADD = \
- libsystemd-basic.la \
- $(DBUS_LIBS)
+systemd_modules_load_LDADD = \
+ libsystemd-basic.la
+
+systemd_vconsole_setup_SOURCES = \
+ src/vconsole-setup.c
+
+systemd_vconsole_setup_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_vconsole_setup_LDADD = \
+ libsystemd-basic.la
+
+systemd_remount_api_vfs_SOURCES = \
+ src/remount-api-vfs.c \
+ src/mount-setup.c
+
+systemd_remount_api_vfs_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_remount_api_vfs_LDADD = \
+ libsystemd-basic.la
systemd_cgroups_agent_SOURCES = \
src/cgroups-agent.c \
libsystemd-basic.la \
$(DBUS_LIBS)
+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
+
systemctl_SOURCES = \
src/systemctl.c \
src/utmp-wtmp.c \
src/path-lookup.c \
src/sd-daemon.c \
src/cgroup-show.c \
- src/cgroup-util.c
+ src/cgroup-util.c \
+ src/exit-status.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
systemd_notify_LDADD = \
libsystemd-basic.la
+systemd_ask_password_SOURCES = \
+ src/ask-password.c
+
+systemd_ask_password_LDADD = \
+ libsystemd-basic.la
+
+systemd_reply_password_SOURCES = \
+ src/reply-password.c
+
+systemd_reply_password_LDADD = \
+ libsystemd-basic.la
+
+systemd_readahead_collect_SOURCES = \
+ src/readahead-collect.c \
+ src/sd-daemon.c \
+ src/readahead-common.c
+
+systemd_readahead_collect_CFLAGS = \
+ $(UDEV_CFLAGS)
+
+systemd_readahead_collect_LDADD = \
+ libsystemd-basic.la \
+ $(UDEV_LIBS)
+
+systemd_readahead_replay_SOURCES = \
+ src/readahead-replay.c \
+ src/sd-daemon.c \
+ src/readahead-common.c
+
+systemd_readahead_replay_CFLAGS = \
+ $(UDEV_CFLAGS)
+
+systemd_readahead_replay_LDADD = \
+ libsystemd-basic.la \
+ $(UDEV_LIBS)
+
systemd_cgls_SOURCES = \
src/cgls.c \
src/cgroup-show.c \
$(DBUSGLIB_LIBS) \
$(GTK_LIBS)
+systemd_ask_password_agent_SOURCES = \
+ src/ask-password-agent.vala
+
+systemd_ask_password_agent_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUSGLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ -Wno-unused-variable \
+ -Wno-unused-function \
+ -Wno-shadow \
+ -Wno-format-nonliteral
+
+systemd_ask_password_agent_VALAFLAGS = \
+ --pkg=dbus-glib-1 \
+ --pkg=posix \
+ --pkg=gtk+-2.0 \
+ --pkg=linux \
+ --pkg=gio-unix-2.0 \
+ --pkg=libnotify \
+ -g
+
+systemd_ask_password_agent_LDADD = \
+ $(DBUSGLIB_LIBS) \
+ $(GTK_LIBS)
+
pam_systemd_la_SOURCES = \
src/pam-module.c \
src/cgroup-util.c \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+ $(DESTDIR)$(systemunitdir)/local-fs.target.wants \
$(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
$(DESTDIR)$(systemunitdir)/runlevel2.target.wants \
$(DESTDIR)$(systemunitdir)/runlevel3.target.wants \
$(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
$(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
+ $(DESTDIR)$(systemunitdir)/multi-user.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
- $(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 )
$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
- $(LN_S) ../systemd-update-utmp-runlevel.service )
+ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
( cd $(DESTDIR)$(systemunitdir)/runlevel2.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
- $(LN_S) ../systemd-update-utmp-runlevel.service )
+ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
( cd $(DESTDIR)$(systemunitdir)/runlevel3.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
- $(LN_S) ../systemd-update-utmp-runlevel.service )
+ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
( cd $(DESTDIR)$(systemunitdir)/runlevel4.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
- $(LN_S) ../systemd-update-utmp-runlevel.service )
+ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
( cd $(DESTDIR)$(systemunitdir)/runlevel5.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
- $(LN_S) ../systemd-update-utmp-runlevel.service )
+ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
- rm -f systemd-update-utmp-shutdown.service && \
- $(LN_S) ../systemd-update-utmp-shutdown.service )
+ rm -f systemd-update-utmp-shutdown.service \
+ hwclock-save.service \
+ systemd-random-seed-save.service && \
+ $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service && \
+ $(LN_S) ../hwclock-save.service hwclock-save.service && \
+ $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
+ ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
+ rm -f systemd-update-utmp-shutdown.service \
+ var-run.service \
+ var-lock.service && \
+ $(LN_S) ../var-run.service var-run.service && \
+ $(LN_S) ../var-lock.service var-lock.service )
( cd $(DESTDIR)$(sessionunitdir) && \
rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
$(LN_S) multi-user.target runlevel4.target && \
$(LN_S) graphical.target runlevel5.target && \
$(LN_S) reboot.target runlevel6.target )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
- rm -f default.target ctrl-alt-del.target kbrequest.target && \
- $(LN_S) $(systemunitdir)/graphical.target default.target && \
- $(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \
- $(LN_S) $(systemunitdir)/rescue.target kbrequest.target )
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f default.target ctrl-alt-del.target && \
+ $(LN_S) graphical.target default.target && \
+ $(LN_S) reboot.target ctrl-alt-del.target )
+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+ rm -f getty.target && \
+ $(LN_S) ../getty.target getty.target )
( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
- rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service systemd-auto-console-getty.service && \
+ rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty2.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty3.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
- $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service && \
- $(LN_S) $(systemunitdir)/systemd-auto-console-getty.service systemd-auto-console-getty.service )
+ $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
- rm -f getty.target remote-fs.target && \
- $(LN_S) $(systemunitdir)/getty.target getty.target && \
+ rm -f remote-fs.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 && \
+ sys-kernel-security.automount \
+ systemd-vconsole-setup.service \
+ systemd-modules-load.service \
+ systemd-random-seed-load.service \
+ sysctl.service \
+ tmpwatch.timer \
+ tmpwatch.service && \
$(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 )
+ $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
+ $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
+ $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
+ $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
+ $(LN_S) ../sysctl.service sysctl.service && \
+ $(LN_S) ../tmpwatch.timer tmpwatch.timer && \
+ $(LN_S) ../tmpwatch.service tmpwatch.service )
( cd $(DESTDIR)$(dbussessionservicedir) && \
rm -f org.freedesktop.systemd1.service && \
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
+if TARGET_DEBIAN
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/umount.target.wants
+ ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
+ rm -f umountfs.service umountnfs.service umountroot.service && \
+ $(LN_S) ../umountfs.service umountfs.service && \
+ $(LN_S) ../umountnfs.service umountnfs.service && \
+ $(LN_S) ../umountroot.service umountroot.service )
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f runlevel5.target && \
+ $(LN_S) multi-user.target runlevel5.target )
+endif
if !TARGET_SUSE
+if !TARGET_DEBIAN
( cd $(DESTDIR)$(systemunitdir) && \
rm -f fsck.target && \
$(LN_S) sysinit.target fsck.target )
endif
+endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
--with-rootdir=$$dc_install_base/$(rootdir)
upload: all distcheck
- cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/
+ cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
scp man/*.html tango:public/systemd-man/
~ianmdlvl / elogind.git / blobdiff