summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2013-06-03 15:54:58 +0200
committerTom Gundersen <teg@jklm.no>2013-06-03 16:00:51 +0200
commit5b46fc6c609cab439eb447c7528d5d7096aa3d2f (patch)
treec0a3986ba5f8d99e83b6a93c951ad0fb32fbe2a4
parent2b7d6965be9a06dadfc971d0d37fc9b2ef0cad7a (diff)
Makefile.am: merge conditionals
Merge all ENABLE_TMPFILES conditionals into one, and merge two ENABLE_EFI conditionals. Also make sure the .in files are always distributed.
-rw-r--r--Makefile.am117
1 files changed, 54 insertions, 63 deletions
diff --git a/Makefile.am b/Makefile.am
index 54c4582abd..70da1e4a2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -282,11 +282,6 @@ rootbin_PROGRAMS = \
systemd-tty-ask-password-agent \
systemd-machine-id-setup
-if ENABLE_TMPFILES
-rootbin_PROGRAMS += \
- systemd-tmpfiles
-endif
-
bin_PROGRAMS = \
systemd-cgls \
systemd-cgtop \
@@ -340,18 +335,6 @@ dist_bashcompletion_DATA = \
shell-completion/bash/systemd-analyze \
shell-completion/bash/udevadm
-if ENABLE_TMPFILES
-dist_tmpfiles_DATA = \
- tmpfiles.d/systemd.conf \
- tmpfiles.d/tmp.conf \
- tmpfiles.d/x11.conf
-
-if HAVE_SYSV_COMPAT
-dist_tmpfiles_DATA += \
- tmpfiles.d/legacy.conf
-endif
-endif
-
dist_sysctl_DATA = \
sysctl.d/50-default.conf
@@ -499,19 +482,6 @@ CLEANFILES += \
units/console-getty.service.m4 \
units/rescue.service.m4
-if ENABLE_TMPFILES
-dist_systemunit_DATA += \
- units/systemd-tmpfiles-clean.timer
-nodist_systemunit_DATA += \
- units/systemd-tmpfiles-setup-dev.service \
- units/systemd-tmpfiles-setup.service \
- units/systemd-tmpfiles-clean.service
-EXTRA_DIST += \
- units/systemd-tmpfiles-setup-dev.service.in \
- units/systemd-tmpfiles-setup.service.in \
- units/systemd-tmpfiles-clean.service.in
-endif
-
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
units/rc-local.service \
@@ -1457,8 +1427,45 @@ systemd_tmpfiles_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-capability.la
+
+rootbin_PROGRAMS += \
+ systemd-tmpfiles
+
+dist_systemunit_DATA += \
+ units/systemd-tmpfiles-clean.timer
+
+nodist_systemunit_DATA += \
+ units/systemd-tmpfiles-setup-dev.service \
+ units/systemd-tmpfiles-setup.service \
+ units/systemd-tmpfiles-clean.service
+
+dist_tmpfiles_DATA = \
+ tmpfiles.d/systemd.conf \
+ tmpfiles.d/tmp.conf \
+ tmpfiles.d/x11.conf
+
+if HAVE_SYSV_COMPAT
+dist_tmpfiles_DATA += \
+ tmpfiles.d/legacy.conf
endif
+SYSINIT_TARGET_WANTS += \
+ systemd-tmpfiles-setup-dev.service \
+ systemd-tmpfiles-setup.service
+
+TIMERS_TARGET_WANTS += \
+ systemd-tmpfiles-clean.timer
+
+INSTALL_DIRS += \
+ $(tmpfilesdir) \
+ $(sysconfdir)/tmpfiles.d
+endif
+
+EXTRA_DIST += \
+ units/systemd-tmpfiles-setup-dev.service.in \
+ units/systemd-tmpfiles-setup.service.in \
+ units/systemd-tmpfiles-clean.service.in
+
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
src/machine-id-setup/machine-id-setup-main.c \
@@ -1557,8 +1564,8 @@ systemd_system_update_generator_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
-# ------------------------------------------------------------------------------
if ENABLE_EFI
+# ------------------------------------------------------------------------------
systemgenerator_PROGRAMS += \
systemd-efi-boot-generator
@@ -1568,6 +1575,22 @@ systemd_efi_boot_generator_SOURCES = \
systemd_efi_boot_generator_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+bootctl_SOURCES = \
+ src/boot/boot.h \
+ src/boot/boot-loader.h \
+ src/boot/bootctl.c \
+ src/boot/boot-loader.c \
+ src/boot/boot-efi.c
+
+bootctl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-id128.la \
+ libsystemd-daemon.la
+
+bin_PROGRAMS += \
+ bootctl
endif
# ------------------------------------------------------------------------------
@@ -3472,24 +3495,6 @@ EXTRA_DIST += \
units/systemd-timedated.service.in
# ------------------------------------------------------------------------------
-if ENABLE_EFI
-bootctl_SOURCES = \
- src/boot/boot.h \
- src/boot/boot-loader.h \
- src/boot/bootctl.c \
- src/boot/boot-loader.c \
- src/boot/boot-efi.c
-
-bootctl_LDADD = \
- libsystemd-shared.la \
- libsystemd-id128.la \
- libsystemd-daemon.la
-
-bin_PROGRAMS += \
- bootctl
-endif
-
-# ------------------------------------------------------------------------------
if HAVE_MYHOSTNAME
libnss_myhostname_la_SOURCES = \
src/nss-myhostname/nss-myhostname.c \
@@ -4132,14 +4137,6 @@ SYSINIT_TARGET_WANTS += \
systemd-sysctl.service \
systemd-ask-password-console.path
-if ENABLE_TMPFILES
-SYSINIT_TARGET_WANTS += \
- systemd-tmpfiles-setup-dev.service \
- systemd-tmpfiles-setup.service
-TIMERS_TARGET_WANTS += \
- systemd-tmpfiles-clean.timer
-endif
-
if HAVE_SYSV_COMPAT
SYSTEM_UNIT_ALIASES += \
poweroff.target runlevel0.target \
@@ -4201,12 +4198,6 @@ INSTALL_DIRS += \
$(dbussessionservicedir) \
$(sysconfdir)/xdg/systemd
-if ENABLE_TMPFILES
-INSTALL_DIRS += \
- $(tmpfilesdir) \
- $(sysconfdir)/tmpfiles.d
-endif
-
install-exec-hook: $(INSTALL_EXEC_HOOKS)
uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)