rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
systemgeneratordir=$(rootdir)/lib/systemd/system-generators
+systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-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\" \
+ -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-DRUNTIME_DIR=\"$(localstatedir)/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
-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
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
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
+
+rootsbin_PROGRAMS = \
+ systemd-machine-id-setup
bin_PROGRAMS = \
- systemd-cgls
+ systemd-cgls \
+ systemd-stdio-bridge
if HAVE_GTK
bin_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-detect-virt \
systemd-sysctl
if HAVE_LIBCRYPTSETUP
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/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
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/systemd-ask-password-console.service \
units/systemd-sysctl.service \
units/syslog.target \
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/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \
units/syslog.target.in \
units/fsck-root.service.in \
units/quotacheck.service.in \
systemd.pc.in \
- introspect.awk
+ 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_MANDRIVA
+dist_systemunit_DATA += \
+ units/mandriva/prefdm.service \
+ units/fedora/rc-local.service \
+ units/fedora/halt-local.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 = \
pkgconfigdata_DATA = \
systemd.pc
-dist_polkitpolicy_DATA = \
+polkitpolicy_DATA = \
src/org.freedesktop.systemd1.policy
noinst_LTLIBRARIES = \
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) \
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 \
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 \
man/systemctl.1 \
man/systemadm.1 \
man/systemd-cgls.1 \
+ man/systemd-tmpfiles.8 \
man/systemd-notify.1 \
man/sd_notify.3 \
man/sd_readahead.3 \
man/systemd.conf.5 \
man/tmpfiles.d.5 \
man/hostname.5 \
+ man/machine-id.5 \
man/vconsole.conf.5 \
man/locale.conf.5 \
man/os-release.5 \
libsystemd-basic.la
test_strv_SOURCES = \
- src/test-strv.c
+ src/test-strv.c \
+ src/specifier.c
test_strv_CFLAGS = \
$(AM_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
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_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)
systemd_cgls_LDADD = \
libsystemd-basic.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 \
-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 = \
systemd_gnome_ask_password_agent_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUSGLIB_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(GTK_CFLAGS) \
-Wno-unused-variable \
-Wno-format-nonliteral
systemd_gnome_ask_password_agent_VALAFLAGS = \
- --pkg=dbus-glib-1 \
--pkg=posix \
--pkg=gtk+-2.0 \
--pkg=linux \
-g
systemd_gnome_ask_password_agent_LDADD = \
- $(DBUSGLIB_LIBS) \
$(LIBNOTIFY_LIBS) \
$(GTK_LIBS)
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-e 's,@rootbindir\@,$(rootbindir),g' \
+ -e 's,@bindir\@,$(bindir),g' \
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
%.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 $@
$(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 += \
remount-rootfs.service \
var-run.mount \
var-lock.mount \
- cryptsetup.target && \
+ 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) ../cryptsetup.target )
+ $(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 && \
systemd-random-seed-load.service \
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
- systemd-ask-password-console.path && \
+ 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 && \
$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
$(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
- $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
+ $(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 plymouth-read-write.service && \
$(LN_S) ../plymouth-start.service plymouth-start.service && \
$(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 )
( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
rm -f plymouth-halt.service && \
$(LN_S) ../plymouth-halt.service plymouth-halt.service )
+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 )
+ ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
+ rm -f display-manager.service && \
+ $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
+endif
+
+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) prefdm.service display-manager.service )
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 && \
~ianmdlvl / elogind.git / blobdiff