diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-initprogs/grp-sleep/systemd-hibernate-resume/Makefile | 10 | ||||
| -rw-r--r-- | src/grp-initprogs/grp-sleep/systemd-sleep/Makefile | 16 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/Makefile | 8 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/systemd-journal-upload/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-journal/journalctl/Makefile | 10 | ||||
| -rw-r--r-- | src/grp-journal/systemd-journald/Makefile | 12 | ||||
| -rw-r--r-- | src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4 | 2 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/Makefile | 8 | ||||
| -rw-r--r-- | src/grp-system/systemd/systemd.tmpfiles | 2 |
10 files changed, 44 insertions, 28 deletions
diff --git a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/Makefile b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/Makefile index a0ca685a00..58b1699d14 100644 --- a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/Makefile +++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/Makefile @@ -32,6 +32,7 @@ systemd_hibernate_resume_generator_SOURCES = \ systemd_hibernate_resume_generator_LDADD = \ libshared.la + endif # ENABLE_HIBERNATE include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/Makefile b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/Makefile index 00c6b88d9e..502f9dfbb6 100644 --- a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/Makefile +++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/Makefile @@ -24,6 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(ENABLE_HIBERNATE),) + rootlibexec_PROGRAMS += \ systemd-hibernate-resume @@ -33,19 +34,12 @@ systemd_hibernate_resume_SOURCES = \ systemd_hibernate_resume_LDADD = \ libshared.la -dist_systemunit_DATA += \ - units/hibernate.target \ - units/hybrid-sleep.target - nodist_systemunit_DATA += \ - units/systemd-hibernate.service \ units/systemd-hibernate-resume@.service \ - units/systemd-hybrid-sleep.service + endif # ENABLE_HIBERNATE EXTRA_DIST += \ - units/systemd-hibernate.service.in \ units/systemd-hibernate-resume@.service.in \ - units/systemd-hybrid-sleep.service.in include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initprogs/grp-sleep/systemd-sleep/Makefile b/src/grp-initprogs/grp-sleep/systemd-sleep/Makefile index db103f05c9..8b99dd2197 100644 --- a/src/grp-initprogs/grp-sleep/systemd-sleep/Makefile +++ b/src/grp-initprogs/grp-sleep/systemd-sleep/Makefile @@ -30,4 +30,20 @@ systemd_sleep_SOURCES = \ systemd_sleep_LDADD = \ libshared.la +ifneq ($(ENABLE_HIBERNATE),) + +dist_systemunit_DATA += \ + units/hibernate.target \ + units/hybrid-sleep.target + +nodist_systemunit_DATA += \ + units/systemd-hibernate.service \ + units/systemd-hybrid-sleep.service + +endif # ENABLE_HIBERNATE + +EXTRA_DIST += \ + units/systemd-hibernate.service.in \ + units/systemd-hybrid-sleep.service.in + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/grp-remote/Makefile b/src/grp-journal/grp-remote/Makefile index 18618942a7..66e419a37e 100644 --- a/src/grp-journal/grp-remote/Makefile +++ b/src/grp-journal/grp-remote/Makefile @@ -23,14 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -ifneq ($(ENABLE_IMPORTD),) - -ifneq ($(HAVE_LIBCURL),) -ifneq ($(HAVE_XZ),) -ifneq ($(HAVE_ZLIB),) -ifneq ($(HAVE_BZIP2),) -ifneq ($(HAVE_GCRYPT),) - nested.subdirs += systemd-journal-gatewayd nested.subdirs += systemd-journal-remote nested.subdirs += systemd-journal-upload diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile index 4a92997441..3c6b92832b 100644 --- a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile +++ b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile @@ -45,7 +45,8 @@ nodist_systemunit_DATA += \ nodist_pkgsysconf_DATA += \ src/journal-remote/journal-upload.conf -endif + +endif # HAVE_LIBCURL EXTRA_DIST += \ units/systemd-journal-upload.service.in \ diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile index 6f464dec7f..fcf118f4d3 100644 --- a/src/grp-journal/journalctl/Makefile +++ b/src/grp-journal/journalctl/Makefile @@ -49,4 +49,14 @@ endif # HAVE_QRENCODE rootbin_PROGRAMS += \ journalctl +nodist_systemunit_DATA += \ + units/systemd-journal-flush.service \ + units/systemd-journal-catalog-update.service +SYSINIT_TARGET_WANTS += \ + systemd-journal-flush.service \ + systemd-journal-catalog-update.service +EXTRA_DIST += \ + units/systemd-journal-flush.service.in \ + units/systemd-journal-catalog-update.service.in + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/systemd-journald/Makefile b/src/grp-journal/systemd-journald/Makefile index 640528bae4..b71b2dc494 100644 --- a/src/grp-journal/systemd-journald/Makefile +++ b/src/grp-journal/systemd-journald/Makefile @@ -40,9 +40,7 @@ dist_systemunit_DATA += \ units/systemd-journald-audit.socket nodist_systemunit_DATA += \ - units/systemd-journald.service \ - units/systemd-journal-flush.service \ - units/systemd-journal-catalog-update.service + units/systemd-journald.service dist_pkgsysconf_DATA += \ src/journal/journald.conf @@ -66,14 +64,10 @@ SOCKETS_TARGET_WANTS += \ systemd-journald-audit.socket SYSINIT_TARGET_WANTS += \ - systemd-journald.service \ - systemd-journal-flush.service \ - systemd-journal-catalog-update.service + systemd-journald.service EXTRA_DIST += \ - units/systemd-journald.service.in \ - units/systemd-journal-flush.service.in \ - units/systemd-journal-catalog-update.service.in + units/systemd-journald.service.in gperf_gperf_sources += \ src/journal/journald-gperf.gperf diff --git a/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4 b/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4 index 1fe0f7acfc..2e8bd8cbef 100644 --- a/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4 +++ b/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4 @@ -7,6 +7,8 @@ # See tmpfiles.d(5) for details +d /run/log 0755 root root - + z /run/log/journal 2755 root systemd-journal - - Z /run/log/journal/%m ~2750 root systemd-journal - - m4_ifdef(`HAVE_ACL',`m4_dnl diff --git a/src/grp-machine/grp-import/Makefile b/src/grp-machine/grp-import/Makefile index dfa189b317..c05eb33061 100644 --- a/src/grp-machine/grp-import/Makefile +++ b/src/grp-machine/grp-import/Makefile @@ -23,6 +23,14 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +ifneq ($(ENABLE_IMPORTD),) + +ifneq ($(HAVE_LIBCURL),) +ifneq ($(HAVE_XZ),) +ifneq ($(HAVE_ZLIB),) +ifneq ($(HAVE_BZIP2),) +ifneq ($(HAVE_GCRYPT),) + nested.subdirs += libimport nested.subdirs += systemd-export nested.subdirs += systemd-import diff --git a/src/grp-system/systemd/systemd.tmpfiles b/src/grp-system/systemd/systemd.tmpfiles index 0a7c85d9ec..00951c92c9 100644 --- a/src/grp-system/systemd/systemd.tmpfiles +++ b/src/grp-system/systemd/systemd.tmpfiles @@ -17,6 +17,4 @@ d /run/systemd/users 0755 root root - d /run/systemd/machines 0755 root root - d /run/systemd/shutdown 0755 root root - -d /run/log 0755 root root - - d /var/lib/systemd 0755 root root - |