X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=65294a56a9d543e5dc17aaf05ba1013c37e2aae7;hb=ddb88cc5b8c5896fc30a86397da6d7e14160801b;hp=2b7d78ccf5c0f502687fbcbf95ed1c1bc379579b;hpb=c65eb8365344eeb72ee2c0b333ab54d925263b3f;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 2b7d78ccf..65294a56a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,6 +109,7 @@ noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
 include_HEADERS =
 pkgconfiglib_DATA =
+polkitpolicy_in_in_files =
 polkitpolicy_in_files =
 polkitpolicy_files =
 dist_udevrules_DATA =
@@ -294,8 +295,7 @@ rootlibexec_PROGRAMS = \
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
 	systemd-fstab-generator \
-	systemd-system-update-generator \
-	systemd-efi-boot-generator
+	systemd-system-update-generator
 
 dist_bin_SCRIPTS = \
 	src/analyze/systemd-analyze
@@ -573,6 +573,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/fdset.h \
 	src/shared/strv.c \
 	src/shared/strv.h \
+	src/shared/env-util.c \
+	src/shared/env-util.h \
 	src/shared/strbuf.c \
 	src/shared/strbuf.h \
 	src/shared/strxcpyx.c \
@@ -967,7 +969,7 @@ dbusinterface_DATA += \
 	org.freedesktop.systemd1.Swap.xml \
 	org.freedesktop.systemd1.Path.xml
 
-polkitpolicy_in_in_files = \
+polkitpolicy_in_in_files += \
 	src/core/org.freedesktop.systemd1.policy.in.in
 
 org.freedesktop.systemd1.%.xml: systemd
@@ -999,14 +1001,14 @@ noinst_PROGRAMS += \
 	test-cgroup \
 	test-install \
 	test-watchdog \
-	test-log \
-	test-efivars
+	test-log
 
 noinst_tests += \
 	test-job-type \
 	test-env-replace \
 	test-strbuf \
 	test-strv \
+	test-strxcpyx \
 	test-unit-name \
 	test-unit-file \
 	test-util \
@@ -1067,11 +1069,16 @@ test_hostname_SOURCES = \
 test_hostname_LDADD = \
 	libsystemd-core.la
 
+if ENABLE_EFI
+noinst_PROGRAMS += \
+	test-efivars
+
 test_efivars_SOURCES = \
 	src/test/test-efivars.c
 
 test_efivars_LDADD = \
 	libsystemd-shared.la
+endif
 
 test_unit_name_SOURCES = \
 	src/test/test-unit-name.c
@@ -1178,6 +1185,12 @@ test_strv_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-id128-internal.la
 
+test_strxcpyx_SOURCES = \
+	src/test/test-strxcpyx.c
+
+test_strxcpyx_LDADD = \
+	libsystemd-shared.la
+
 test_install_SOURCES = \
 	src/test/test-install.c
 
@@ -1400,12 +1413,17 @@ systemd_system_update_generator_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+if ENABLE_EFI
+systemgenerator_PROGRAMS +=  \
+	systemd-efi-boot-generator
+
 systemd_efi_boot_generator_SOURCES = \
 	src/efi-boot-generator/efi-boot-generator.c
 
 systemd_efi_boot_generator_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
+endif
 
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
@@ -3060,7 +3078,6 @@ timedatectl_LDADD = \
 
 bin_PROGRAMS += \
 	timedatectl
-
 endif
 
 polkitpolicy_in_files += \
@@ -3069,6 +3086,24 @@ polkitpolicy_in_files += \
 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 = \
@@ -3450,9 +3485,11 @@ units/user/%: units/%.m4 Makefile
 	$(AM_V_M4)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
+if ENABLE_POLKIT
 nodist_polkitpolicy_DATA = \
 	$(polkitpolicy_files) \
 	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
+endif
 
 EXTRA_DIST += \
 	$(polkitpolicy_in_files) \