chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: allow setting a per-connection default value for the "allow-interactive-authe...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index d739445e83670754313ea2b26231786f0fc7f494..51c6d33af04ca93453ab6bdf93038b6aae892782 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2479,15
+2479,21
@@
systemd_efi_boot_generator_LDADD = \
# ------------------------------------------------------------------------------
bootctl_SOURCES = \
# ------------------------------------------------------------------------------
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
+ src/boot/bootctl.c
+
+bootctl_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\" \
+ -DSD_BOOTLIBDIR=\"$(sd_bootlibdir)\"
+
+bootctl_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(BLKID_CFLAGS)
bootctl_LDADD = \
libsystemd-shared.la \
bootctl_LDADD = \
libsystemd-shared.la \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ $(BLKID_LIBS)
bin_PROGRAMS += \
bootctl
bin_PROGRAMS += \
bootctl
@@
-2499,6
+2505,7
@@
dist_zshcompletion_DATA += \
shell-completion/zsh/_bootctl
# ------------------------------------------------------------------------------
shell-completion/zsh/_bootctl
# ------------------------------------------------------------------------------
+if HAVE_GNUEFI
efi_cppflags = \
$(EFI_CPPFLAGS) \
-I$(top_builddir) -include config.h \
efi_cppflags = \
$(EFI_CPPFLAGS) \
-I$(top_builddir) -include config.h \
@@
-2619,6
+2626,7
@@
test-efi-disk.img: $(sd_boot) $(stub) test/test-efi-create-disk.sh
test-efi: test-efi-disk.img
$(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img
endif
test-efi: test-efi-disk.img
$(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img
endif
+endif
# ------------------------------------------------------------------------------
if HAVE_BLKID
# ------------------------------------------------------------------------------
if HAVE_BLKID