bash-completion > shell-completion

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3d96500c89db8c5a6b721c00bbb951fd00683394..e4c7e564f0657f19cec6b8ada68095c354bbb4f3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,7 +117,6 @@ udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \

-       -DSYSCONFDIR=\""$(sysconfdir)"\" \

        -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
        -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
        -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
        -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
        -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
        -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \


@@ -242,7 +241,7 @@ systemgenerator_PROGRAMS = \
        systemd-system-update-generator
 
 dist_bashcompletion_DATA = \
        systemd-system-update-generator
 
 dist_bashcompletion_DATA = \

-       bash-completion/systemd-bash-completion.sh
+       shell-completion/systemd-bash-completion.sh

 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \


@@ -273,7 +272,7 @@ dist_systemunit_DATA = \
        units/nss-user-lookup.target \
        units/mail-transfer-agent.target \
        units/hibernate.target \
        units/nss-user-lookup.target \
        units/mail-transfer-agent.target \
        units/hibernate.target \

-       units/http-daemon.target \
+       units/hybrid-sleep.target \

        units/poweroff.target \
        units/reboot.target \
        units/rescue.target \
        units/poweroff.target \
        units/reboot.target \
        units/rescue.target \


@@ -329,6 +328,7 @@ nodist_systemunit_DATA = \
        units/rescue.service \
        units/user@.service \
        units/systemd-hibernate.service \
        units/rescue.service \
        units/user@.service \
        units/systemd-hibernate.service \

+       units/systemd-hybrid-sleep.service \

        units/systemd-suspend.service \
        units/systemd-halt.service \
        units/systemd-poweroff.service \
        units/systemd-suspend.service \
        units/systemd-halt.service \
        units/systemd-poweroff.service \


@@ -379,6 +379,7 @@ EXTRA_DIST += \
        units/systemd-udev-settle.service \
        units/debug-shell.service.in \
        units/systemd-hibernate.service.in \
        units/systemd-udev-settle.service \
        units/debug-shell.service.in \
        units/systemd-hibernate.service.in \

+       units/systemd-hybrid-sleep.service.in \

        units/systemd-suspend.service.in \
        units/quotaon.service.in \
        introspect.awk \
        units/systemd-suspend.service.in \
        units/quotaon.service.in \
        introspect.awk \


@@ -534,6 +535,7 @@ MANPAGES_ALIAS = \
        man/systemd-shutdownd.socket.8 \
        man/systemd-shutdownd.8 \
        man/systemd-hibernate.service.8 \
        man/systemd-shutdownd.socket.8 \
        man/systemd-shutdownd.8 \
        man/systemd-hibernate.service.8 \

+       man/systemd-hybrid-sleep.service.8 \

        man/systemd-sleep.8 \
        man/systemd-shutdown.8 \
        man/systemd-poweroff.service.8 \
        man/systemd-sleep.8 \
        man/systemd-shutdown.8 \
        man/systemd-poweroff.service.8 \


@@ -608,6 +610,7 @@ 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-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-hybrid-sleep.service.8: man/systemd-suspend.service.8

 man/systemd-sleep.8: man/systemd-suspend.service.8
 man/systemd-shutdown.8: man/systemd-halt.service.8
 man/systemd-poweroff.service.8: man/systemd-halt.service.8
 man/systemd-sleep.8: man/systemd-suspend.service.8
 man/systemd-shutdown.8: man/systemd-halt.service.8
 man/systemd-poweroff.service.8: man/systemd-halt.service.8


@@ -798,7 +801,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
        src/shared/hwclock.c \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
        src/shared/hwclock.c \

-       src/shared/hwclock.h
+       src/shared/hwclock.h \
+       src/shared/time-dst.c \
+       src/shared/time-dst.h

 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \


@@ -1176,7 +1181,8 @@ noinst_PROGRAMS += \
        test-unit-name \
        test-log \
        test-unit-file \
        test-unit-name \
        test-log \
        test-unit-file \

-       test-date
+       test-date \
+       test-sleep

 
 TESTS += \
        test-job-type \
 
 TESTS += \
        test-job-type \


@@ -1184,7 +1190,8 @@ TESTS += \
        test-strv \
        test-unit-name \
        test-unit-file \
        test-strv \
        test-unit-name \
        test-unit-file \

-       test-date
+       test-date \
+       test-sleep

 
 test_engine_SOURCES = \
        src/test/test-engine.c
 
 test_engine_SOURCES = \
        src/test/test-engine.c


@@ -1252,6 +1259,12 @@ test_date_SOURCES = \
 test_date_LDADD = \
        libsystemd-core.la
 
 test_date_LDADD = \
        libsystemd-core.la
 

+test_sleep_SOURCES = \
+       src/test/test-sleep.c
+
+test_sleep_LDADD = \
+       libsystemd-core.la
+

 test_daemon_SOURCES = \
        src/test/test-daemon.c
 
 test_daemon_SOURCES = \
        src/test/test-daemon.c