SUBDIRS = . po
LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
LIBUDEV_AGE=0
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=4
-LIBSYSTEMD_LOGIN_AGE=2
+LIBSYSTEMD_LOGIN_CURRENT=3
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=2
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=5
+LIBSYSTEMD_ID128_REVISION=6
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=1
-LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=1
+LIBSYSTEMD_JOURNAL_CURRENT=2
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=2
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
nodist_udevrules_DATA =
dist_man_MANS =
dist_pkgsysconf_DATA =
+dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
-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
if TARGET_ANGSTROM
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
endif
endif
endif
-endif
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/syslog.target \
- units/systemd-udev-control.socket \
- units/systemd-udev-kernel.socket \
- units/systemd-timedated-ntp.target \
+ units/systemd-udevd-control.socket \
+ units/systemd-udevd-kernel.socket \
units/system-update.target
nodist_systemunit_DATA = \
units/systemd-kexec.service \
units/systemd-fsck@.service \
units/systemd-fsck-root.service \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
- units/systemd-debug-shell.service
+ units/debug-shell.service
dist_userunit_DATA = \
units/user/default.target \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
units/user@.service.in \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
- units/systemd-debug-shell.service.in \
+ units/debug-shell.service.in \
units/systemd-hibernate.service.in \
units/systemd-suspend.service.in \
introspect.awk \
man/systemd-initctl.service.8 \
man/systemd-shutdownd.service.8 \
man/systemd-suspend.service.8 \
- man/systemd-halt.service.8
+ man/systemd-halt.service.8 \
+ man/systemd-fsck@.service.8 \
+ man/systemd-ask-password-console.service.8 \
+ man/systemd-analyze.1 \
+ man/systemd-tty-ask-password-agent.1 \
+ man/systemd-getty-generator.8 \
+ man/systemd-system-update-generator.8 \
+ man/systemd-fstab-generator.8 \
+ man/systemd.preset.5 \
+ man/sd-id128.7 \
+ man/sd_id128_to_string.3 \
+ man/sd_id128_randomize.3 \
+ man/sd-journal.7 \
+ man/sd_journal_print.3
MANPAGES_ALIAS = \
man/reboot.8 \
man/init.1 \
man/systemd-modules-load.8 \
man/systemd-sysctl.8 \
+ man/systemd-journald.socket.8 \
man/systemd-journald.8 \
man/systemd-remount-fs.8 \
man/systemd-update-utmp-shutdown.service.8 \
man/systemd-update-utmp.8 \
+ man/systemd-initctl.socket.8 \
man/systemd-initctl.8 \
+ man/systemd-shutdownd.socket.8 \
man/systemd-shutdownd.8 \
man/systemd-hibernate.service.8 \
man/systemd-sleep.8 \
man/systemd-shutdown.8 \
man/systemd-poweroff.service.8 \
man/systemd-reboot.service.8 \
- man/systemd-kexec.service.8
+ man/systemd-kexec.service.8 \
+ man/systemd-fsck-root.service.8 \
+ man/systemd-ask-password-console.path.8 \
+ man/systemd-ask-password-wall.service.8 \
+ man/systemd-ask-password-wall.path.8 \
+ man/systemd-tmpfiles-setup.service.8 \
+ man/systemd-tmpfiles-clean.service.8 \
+ man/systemd-tmpfiles-clean.timer.8 \
+ man/sd_id128_t.7 \
+ man/SD_ID128_MAKE.7 \
+ man/SD_ID128_FORMAT_STR.7 \
+ man/SD_ID128_FORMAT_VAL.7 \
+ man/sd_id128_equal.7 \
+ man/sd_id128_from_string.3 \
+ man/sd_id128_get_machine.3 \
+ man/sd_id128_get_boot.3 \
+ man/sd_journal_printv.3 \
+ man/sd_journal_send.3 \
+ man/sd_journal_sendv.3
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/init.1: man/systemd.1
man/systemd-modules-load.8: man/systemd-modules-load.service.8
man/systemd-sysctl.8: man/systemd-sysctl.service.8
+man/systemd-journald.socket.8: man/systemd-journald.service.8
man/systemd-journald.8: man/systemd-journald.service.8
man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-initctl.socket.8: man/systemd-initctl.service.8
man/systemd-initctl.8: man/systemd-initctl.service.8
+man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8
man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
man/systemd-hibernate.service.8: man/systemd-suspend.service.8
man/systemd-sleep.8: man/systemd-suspend.service.8
man/systemd-poweroff.service.8: man/systemd-halt.service.8
man/systemd-reboot.service.8: man/systemd-halt.service.8
man/systemd-kexec.service.8: man/systemd-halt.service.8
+man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
+man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
+man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
+man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
+man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
+man/sd_id128_t.7: man/sd-id128.7
+man/SD_ID128_MAKE.7: man/sd-id128.7
+man/SD_ID128_FORMAT_STR.7: man/sd-id128.7
+man/SD_ID128_FORMAT_VAL.7: man/sd-id128.7
+man/sd_id128_equal.7: man/sd-id128.7
+man/sd_id128_from_string.3: man/sd_id128_to_string.3
+man/sd_id128_get_machine.3: man/sd_id128_randomize.3
+man/sd_id128_get_boot.3: man/sd_id128_randomize.3
+man/sd_journal_printv.3: man/sd_journal_print.3
+man/sd_journal_send.3: man/sd_journal_print.3
+man/sd_journal_sendv.3: man/sd_journal_print.3
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
$(AM_CFLAGS)
libsystemd_logs_la_LIBADD = \
- libsystemd-journal.la \
- libsystemd-id128.la
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
systemd_LDADD = \
libsystemd-core.la \
libsystemd-daemon.la \
- libsystemd-id128.la \
+ libsystemd-id128-internal.la \
libsystemd-dbus.la
dist_pkgsysconf_DATA += \
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-journal.la \
- libsystemd-id128.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
libsystemd-dbus.la \
libsystemd-logs.la
src/udev/udev.pc
EXTRA_DIST += \
- units/systemd-udev.service.in \
+ units/systemd-udevd.service.in \
units/systemd-udev-trigger.service.in \
units/systemd-udev-settle.service.in
CLEANFILES += \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service
systemd-install-hook:
mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
- ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
- ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
+ ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
+ ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
- ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service
+ ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook
libsystemd_id128_la_LIBADD = \
libsystemd-shared.la
+libsystemd_id128_internal_la_SOURCES = \
+ $(libsystemd_id128_la_SOURCES)
+
test_id128_SOURCES = \
src/test/test-id128.c
test_id128_LDADD = \
libsystemd-shared.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
noinst_PROGRAMS += \
test-id128
lib_LTLIBRARIES += \
libsystemd-id128.la
+noinst_LTLIBRARIES += \
+ libsystemd-id128-internal.la
+
pkgconfiglib_DATA += \
src/libsystemd-id128/libsystemd-id128.pc
libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-daemon.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
if ENABLE_LOGIND
systemd_journald_LDADD += \
- libsystemd-login.la
+ libsystemd-login-internal.la
endif
if HAVE_ACL
systemd_cat_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la
+ libsystemd-journal-internal.la
journalctl_SOURCES = \
src/journal/journalctl.c
journalctl_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la \
- libsystemd-id128.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
libsystemd-logs.la
test_journal_SOURCES = \
test_journal_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
if HAVE_XZ
test_journal_SOURCES += \
test_journal_send_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
+
+libsystemd_journal_internal_la_SOURCES = \
+ $(libsystemd_journal_la_SOURCES)
if HAVE_XZ
libsystemd_journal_la_SOURCES += \
libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS = \
+ $(AM_CFLAGS)
+ $(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD = \
+ $(XZ_LIBS)
+
endif
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
lib_LTLIBRARIES += \
libsystemd-journal.la
+noinst_LTLIBRARIES += \
+ libsystemd-journal-internal.la
+
rootlibexec_PROGRAMS += \
systemd-journald
units/systemd-journald.socket
nodist_systemunit_DATA += \
- units/systemd-journald.service
+ units/systemd-journald.service \
+ units/systemd-journal-flush.service
dist_pkgsysconf_DATA += \
src/journal/journald.conf
src/journal/libsystemd-journal.pc.in \
src/journal/libsystemd-journal.sym \
units/systemd-journald.service.in \
+ units/systemd-journal-flush.service.in \
src/journal/journald-gperf.gperf
CLEANFILES += \
src/journal/coredump.c
systemd_coredump_LDADD = \
- libsystemd-journal.la \
+ libsystemd-journal-internal.la \
libsystemd-label.la \
libsystemd-shared.la
if ENABLE_LOGIND
systemd_coredump_LDADD += \
- libsystemd-login.la
+ libsystemd-login-internal.la
endif
rootlibexec_PROGRAMS += \
MANPAGES += \
man/sd_readahead.3 \
- man/sd-readahead.7
+ man/sd-readahead.7 \
+ man/systemd-readahead-replay.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-readahead-collect.service.8 \
+ man/systemd-readahead-done.service.8 \
+ man/systemd-readahead-done.timer.8 \
+ man/systemd-readahead.8
+
+man/systemd-readahead-collect.service.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead-done.service.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead-done.timer.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead.8: man/systemd-readahead-replay.service.8
+
endif
# ------------------------------------------------------------------------------
systemd_quotacheck_LDADD = \
libsystemd-shared.la
+
+MANPAGES += \
+ man/systemd-quotacheck.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-quotacheck.8
+
+man/systemd-quotacheck.8: man/systemd-quotacheck.service.8
+
endif
# ------------------------------------------------------------------------------
INSTALL_DATA_HOOKS += \
cryptsetup-install-data-hook
+
+MANPAGES += \
+ man/systemd-cryptsetup@.service.8 \
+ man/systemd-cryptsetup-generator.8 \
+ man/crypttab.5
+
+MANPAGES_ALIAS += \
+ man/systemd-cryptsetup.8
+
+man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8
+
endif
# ------------------------------------------------------------------------------
EXTRA_DIST += \
units/systemd-localed.service.in
-dist_pkgdata_DATA = \
+dist_pkgdata_DATA += \
src/locale/kbd-model-map
dist_noinst_SCRIPT = \
src/login/test-login.c
test_login_LDADD = \
- libsystemd-login.la \
+ libsystemd-login-internal.la \
libsystemd-shared.la
test_inhibit_SOURCES = \
libsystemd_login_la_LIBADD = \
libsystemd-shared.la
+libsystemd_login_internal_la_SOURCES = \
+ $(libsystemd_login_la_SOURCES)
+
if HAVE_PAM
pam_systemd_la_SOURCES = \
src/login/pam-module.c
lib_LTLIBRARIES += \
libsystemd-login.la
+noinst_LTLIBRARIES += \
+ libsystemd-login-internal.la
+
pkgconfiglib_DATA += \
src/login/libsystemd-login.pc
( cd $(DESTDIR)$(dbussessionservicedir) && \
rm -f org.freedesktop.systemd1.service && \
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-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
( cd $(DESTDIR)$(systemunitdir) && \
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_MANDRIVA
$(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
rm -f display-manager.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
install-exec-hook: $(INSTALL_EXEC_HOOKS)