conf_files_list(): split out conf_files_list_strv()

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bf095175107e89b7fb437f47e6b91fe9bbcd9263..c85a401db43b20ff944007da4c99ec81310d258d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -481,7 +481,8 @@ MANPAGES = \
        man/systemd-machine-id-setup.1 \
        man/systemd-detect-virt.1 \
        man/journald.conf.5 \
        man/systemd-machine-id-setup.1 \
        man/systemd-detect-virt.1 \
        man/journald.conf.5 \

-       man/journalctl.1
+       man/journalctl.1 \
+       man/systemd-inhibit.1

 
 MANPAGES_ALIAS = \
        man/reboot.8 \
 
 MANPAGES_ALIAS = \
        man/reboot.8 \


@@ -904,7 +905,8 @@ test_job_type_CFLAGS = \
        $(DBUS_CFLAGS)
 
 test_job_type_LDADD = \
        $(DBUS_CFLAGS)
 
 test_job_type_LDADD = \

-       libsystemd-core.la
+       libsystemd-core.la \
+       libsystemd-daemon.la

 
 test_ns_SOURCES = \
        src/test/test-ns.c
 
 test_ns_SOURCES = \
        src/test/test-ns.c


@@ -2665,6 +2667,20 @@ loginctl_LDADD = \
 rootbin_PROGRAMS += \
        loginctl
 
 rootbin_PROGRAMS += \
        loginctl
 

+systemd_inhibit_SOURCES = \
+       src/login/inhibit.c
+
+systemd_inhibit_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_inhibit_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-dbus.la
+
+rootbin_PROGRAMS += \
+       systemd-inhibit
+

 test_login_SOURCES = \
        src/login/test-login.c
 
 test_login_SOURCES = \
        src/login/test-login.c
 


@@ -2888,6 +2904,7 @@ SED_PROCESS = \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \

+               -e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \

                -e 's,@prefix\@,$(prefix),g' \
                -e 's,@exec_prefix\@,$(exec_prefix),g' \
                -e 's,@libdir\@,$(libdir),g' \
                -e 's,@prefix\@,$(prefix),g' \
                -e 's,@exec_prefix\@,$(exec_prefix),g' \
                -e 's,@libdir\@,$(libdir),g' \


@@ -3164,10 +3181,6 @@ if TARGET_MEEGO
 endif
 
 if TARGET_FEDORA
 endif
 
 if TARGET_FEDORA

-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( 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 single.service && \
                $(LN_S) prefdm.service display-manager.service && \
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service single.service && \
                $(LN_S) prefdm.service display-manager.service && \


@@ -3178,10 +3191,6 @@ if TARGET_FEDORA
 endif
 
 if TARGET_MANDRIVA
 endif
 
 if TARGET_MANDRIVA

-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( 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 dm.service single.service && \
                $(LN_S) prefdm.service display-manager.service && \
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service dm.service single.service && \
                $(LN_S) prefdm.service display-manager.service && \


@@ -3199,20 +3208,12 @@ if TARGET_DEBIAN_OR_UBUNTU
 endif
 
 if TARGET_SUSE
 endif
 
 if TARGET_SUSE

-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants

        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )

-       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-               rm -f halt-local.service && \
-               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )

 endif
 
 if TARGET_MAGEIA
 endif
 
 if TARGET_MAGEIA

-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( 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) && \
                rm -f display-manager.service && \
                $(LN_S) prefdm.service display-manager.service && \