delete plymouth units; moved to plymouth

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2e29a0f41246bd586e56df6dd2d6651634ba6f41..f45fa27475953b71ddb59d18bb2116d151ffa757 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ LIBGUDEV_REVISION=1
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=3
+LIBSYSTEMD_LOGIN_REVISION=4
 LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -340,7 +340,8 @@ nodist_systemunit_DATA = \
        units/user@.service \
        units/systemd-udev.service \
        units/systemd-udev-trigger.service \
-       units/systemd-udev-settle.service
+       units/systemd-udev-settle.service \
+       units/systemd-debug-shell.service
 
 dist_userunit_DATA = \
        units/user/default.target \
@@ -378,6 +379,7 @@ EXTRA_DIST += \
        units/systemd-udev.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
+       units/systemd-debug-shell.service.in \
        units/hibernate.service.in \
        units/suspend.service.in \
        introspect.awk \
@@ -423,25 +425,6 @@ systemgenerator_PROGRAMS += \
        systemd-rc-local-generator
 endif
 
-if HAVE_PLYMOUTH
-dist_systemunit_DATA += \
-       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 = \
        README \
        NEWS \
@@ -499,6 +482,7 @@ MANPAGES = \
        man/systemd-machine-id-setup.1 \
        man/systemd-detect-virt.1 \
        man/journald.conf.5 \
+       man/systemd-journald.service.8 \
        man/journalctl.1 \
        man/systemd-inhibit.1
 
@@ -507,13 +491,15 @@ MANPAGES_ALIAS = \
        man/poweroff.8 \
        man/init.1 \
        man/systemd-modules-load.8 \
-       man/systemd-sysctl.8
+       man/systemd-sysctl.8 \
+       man/systemd-journald.8
 
 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.8: man/systemd-journald.service.8
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -1908,12 +1894,14 @@ TESTS += \
        src/udev/keymap/check-keymaps.sh
 
 EXTRA_DIST += \
-       src/udev/keymap/check-keymaps.sh
+       src/udev/keymap/check-keymaps.sh \
+       src/udev/keymap/keyboard-force-release.sh.in
 
 CLEANFILES += \
        $(nodist_keymap_SOURCES) \
        src/udev/keymap/keys.txt \
-       src/udev/keymap/keys-from-name.gperf
+       src/udev/keymap/keys-from-name.gperf \
+       src/udev/keymap/keyboard-force-release.sh
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
@@ -2397,13 +2385,18 @@ systemd_readahead_collect_LDADD = \
 
 systemd_readahead_replay_SOURCES = \
        src/readahead/readahead-replay.c \
-       src/readahead/readahead-common.c
+       src/readahead/readahead-common.c \
+       src/readahead/readahead-common.h
 
 systemd_readahead_replay_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
        libudev.la
 
+systemd_readahead_analyze_SOURCES = \
+       src/readahead/readahead-analyze.c \
+       src/readahead/readahead-common.h
+
 pkginclude_HEADERS += \
        src/systemd/sd-readahead.h
 
@@ -2411,6 +2404,9 @@ rootlibexec_PROGRAMS += \
        systemd-readahead-collect \
        systemd-readahead-replay
 
+bin_PROGRAMS += \
+       systemd-readahead-analyze
+
 dist_systemunit_DATA += \
        units/systemd-readahead-drop.service \
        units/systemd-readahead-done.timer
@@ -3006,6 +3002,7 @@ SED_PROCESS = \
                -e 's,@VERSION\@,$(VERSION),g' \
                -e 's,@rootprefix\@,$(rootprefix),g' \
                -e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \
+               -e 's,@sushell\@,$(sushell),g' \
                < $< > $@ || rm $@
 
 units/%: units/%.in Makefile
@@ -3233,33 +3230,6 @@ systemd-install-data-hook:
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if HAVE_PLYMOUTH
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/reboot.target.wants \
-               $(DESTDIR)$(systemunitdir)/kexec.target.wants \
-               $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
-               $(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 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)/kexec.target.wants && \
-               rm -f plymouth-kexec.service && \
-               $(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
-       ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
-               rm -f plymouth-poweroff.service && \
-               $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
-       ( 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 && \