# 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
-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\" \
- -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)\" \
-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\" \
endif
endif
endif
+endif
rootbin_PROGRAMS = \
systemd \
systemd-notify \
systemd-ask-password \
systemd-tty-ask-password-agent \
- systemd-tmpfiles
-
-rootsbin_PROGRAMS = \
+ 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 += \
systemd-timestamp \
systemd-ac-power \
systemd-detect-virt \
- systemd-sysctl
+ 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
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
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 \
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 \
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/systemd-tmpfiles-clean.timer \
units/quotaon.service \
units/systemd-ask-password-wall.path \
- units/systemd-ask-password-console.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 \
units/systemd-ask-password-wall.service \
units/systemd-ask-password-console.service \
units/systemd-sysctl.service \
- units/syslog.target \
+ units/systemd-binfmt.service \
units/halt.service \
units/poweroff.service \
units/reboot.service \
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 \
units/systemd-ask-password-wall.service.in \
units/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \
- units/syslog.target.in \
+ units/systemd-binfmt.service.in \
units/halt.service.in \
units/poweroff.service.in \
units/reboot.service.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/halt-local.service
endif
+if TARGET_FRUGALWARE
+dist_systemunit_DATA += \
+ units/frugalware/display-manager.service
+endif
+
if HAVE_PLYMOUTH
dist_systemunit_DATA += \
units/plymouth-start.service \
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 \
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) \
${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 \
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/vconsole.conf.5 \
man/locale.conf.5 \
man/os-release.5 \
- man/modules-load.d.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 \
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 \
src/umount.c \
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
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
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
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' \
%.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 += \
$(dbusinterface_DATA)
install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(tmpfilesdir) \
+ $(DESTDIR)$(sysconfdir)/modules-load.d \
+ $(DESTDIR)$(sysconfdir)/sysctl.d \
+ $(DESTDIR)$(sysconfdir)/binfmt.d \
+ $(DESTDIR)$(systemshutdowndir) \
+ $(DESTDIR)$(systemgeneratordir) \
+ $(DESTDIR)$(usergeneratordir)
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(userunitdir) \
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 sound.target && \
$(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 && \
$(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 )
systemd-random-seed-load.service \
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
+ systemd-binfmt.service \
systemd-ask-password-console.path \
systemd-kmsg-syslogd.service \
cryptsetup.target && \
$(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-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 )
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
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 )
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 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 )
$(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) \
~ianmdlvl / elogind.git / blobdiff