diff options
author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2015-05-25 11:18:17 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2015-05-25 16:56:29 +0200 |
commit | f80099c06fd12c87da4d2207fb2e2f31ffaec6ed (patch) | |
tree | e5dbbdb11793301a361b725c2833cfbc274912f7 /Makefile.am | |
parent | 77eb82f9f0f60535ab5f585834ed6e66cf39b184 (diff) |
build-sys: always include src/boot/efi in tarballs
currently it would only be included if configure was ran with --enable-gnuefi
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 70d4dc004e..9420879339 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2601,6 +2601,8 @@ EFI_FORMAT = -O binary else EFI_FORMAT = --target=efi-app-$(EFI_ARCH) endif +endif +endif # ------------------------------------------------------------------------------ systemd_boot_headers = \ @@ -2616,13 +2618,16 @@ systemd_boot_sources = \ src/boot/efi/pefile.c \ src/boot/efi/boot.c +EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers) + +if ENABLE_EFI +if HAVE_GNUEFI systemd_boot_objects = $(addprefix $(top_builddir)/,$(systemd_boot_sources:.c=.o)) systemd_boot_solib = $(top_builddir)/src/boot/efi/systemd_boot.so systemd_boot = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi bootlib_DATA = $(systemd_boot) CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot) -EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers) $(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers)) @$(MKDIR_P) $(top_builddir)/src/boot/efi/ @@ -2636,6 +2641,8 @@ $(systemd_boot_solib): $(systemd_boot_objects) $(systemd_boot): $(systemd_boot_solib) $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@ +endif +endif # ------------------------------------------------------------------------------ stub_headers = \ @@ -2653,13 +2660,16 @@ stub_sources = \ src/boot/efi/linux.c \ src/boot/efi/stub.c +EXTRA_DIST += $(stub_sources) $(stub_headers) + +if ENABLE_EFI +if HAVE_GNUEFI stub_objects = $(addprefix $(top_builddir)/,$(stub_sources:.c=.o)) stub_solib = $(top_builddir)/src/boot/efi/stub.so stub = linux$(EFI_MACHINE_TYPE_NAME).efi.stub bootlib_DATA += $(stub) CLEANFILES += $(stub_objects) $(stub_solib) $(stub) -EXTRA_DIST += $(stub_sources) $(stub_headers) $(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers)) @$(MKDIR_P) $(top_builddir)/src/boot/efi/ |