X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=a5e07cfa68ea27f81832eff178b0b85a74c2eb46;hb=8d4efa540a88b19a475452d8ccc3c9824849fa86;hp=d739445e83670754313ea2b26231786f0fc7f494;hpb=0fa2cac4f0cdefaf1addd7f1fe0fd8113db9360b;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index d739445e8..a5e07cfa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2479,15 +2479,21 @@ systemd_efi_boot_generator_LDADD = \
 
 # ------------------------------------------------------------------------------
 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 \
-	libsystemd-internal.la
+	libsystemd-internal.la \
+	$(BLKID_LIBS)
 
 bin_PROGRAMS += \
 	bootctl
@@ -2499,6 +2505,7 @@ dist_zshcompletion_DATA += \
 	shell-completion/zsh/_bootctl
 
 # ------------------------------------------------------------------------------
+if HAVE_GNUEFI
 efi_cppflags = \
 	$(EFI_CPPFLAGS) \
 	-I$(top_builddir) -include config.h \
@@ -2526,7 +2533,8 @@ if ARCH_X86_64
 efi_cflags += \
 	-mno-red-zone \
 	-DEFI_FUNCTION_WRAPPER \
-	-DGNU_EFI_USE_MS_ABI
+	-DGNU_EFI_USE_MS_ABI \
+	-std=gnu90
 endif
 
 efi_ldflags = \
@@ -2619,6 +2627,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
+endif
 
 # ------------------------------------------------------------------------------
 if HAVE_BLKID