[MULTIBOOT2 SPEC PATCH v4 22/27] multiboot2: Always define the kernel_* vars

[Hans Ulrich Niedermann]

Always define the kernel_* vars independent of the
BUILD_EXAMPLE_KERNEL conditional. This should make
sure that we actually distribute the kernel sources
even when we are not building the example kernel.

Note that this does not mean we always *build* the
example kernel. EXTRA_PROGRAMS are *not* built when
running "make all".

We still only build "if BUILD_EXAMPLE_KERNEL", which
is when noinst_PROGRAMS is set.

Signed-off-by: Hans Ulrich Niedermann <address@hidden>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b19fc24bf..cb290a0cb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,12 +9,13 @@ pkginclude_HEADERS = multiboot2.h
 # The example kernel is built if you specify --enable-example-kernel.
 if BUILD_EXAMPLE_KERNEL
 noinst_PROGRAMS = kernel
+endif
+
 kernel_SOURCES = boot_$(kernel_boot_arch).S kernel.c multiboot2.h
 kernel_CCASFLAGS = $(kernel_ccasflags)
 kernel_CFLAGS = $(kernel_cflags) -fno-builtin -nostdinc -O -g -Wall \
        -imacros $(top_builddir)/config.h
 kernel_LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,80100000 -Wl,--build-id=none
-endif
 
 EXTRA_DIST = $(man_MANS) $(noinst_SCRIPTS) \
        $(arch_sources) $(multiboot_TEXINFOS)
-- 
2.26.2