working copy, wo nested packaging

autogen.sh

@@ -4,44 +4,21 @@ set -e
 
 autogen --version >/dev/null || (echo autogen missing; exit 1)
 
-echo "Creating symlinks..."
-ln -svf ../NEWS grub-core/
-ln -svf ../TODO grub-core/
-ln -svf ../THANKS grub-core/
-ln -svf ../README grub-core/
-ln -svf ../INSTALL grub-core/
-ln -svf ../AUTHORS grub-core/
-ln -svf ../COPYING grub-core/
-ln -svf ../ABOUT-NLS grub-core/
-ln -svf ../ChangeLog grub-core/
-ln -svf ../aclocal.m4 grub-core/
-ln -svf ../acinclude.m4 grub-core/
-ln -svf ../config.rpath grub-core/
-ln -svf ../gentpl.py grub-core/
-ln -svf ../configure.common grub-core/
-
-mkdir -vp grub-core/docs/man
-ln -svf ../../../docs/man/grub-emu.h2m grub-core/docs/man
-
 echo "Creating Makefile.tpl..."
 python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+
 echo "Running autogen..."
 autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am
-
+autogen -T Makefile.tpl grub-core/modules.def | sed -e '/^$/{N;/^\n$/D;}' > grub-core/modules.am
-echo "Creating grub-core/Makefile.tpl..."
-(cd grub-core && python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl)
-echo "Running autogen..."
-(cd grub-core && autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am)
 
 echo "Importing unicode..."
 python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
 
 echo "Importing libgcrypt..."
-(cd grub-core && python import_gcry.py lib/libgcrypt/ .)
+python util/import_gcry.py grub-core/lib/libgcrypt/ grub-core
 
 echo "Saving timestamps..."
 echo timestamp > stamp-h.in
-(cd grub-core && echo timestamp > stamp-h.in)
 
 echo "Running autoreconf..."
 autoreconf -vi

configure.ac

@@ -33,13 +33,15 @@ dnl package (in grub-core directory) builds with TARGETCC.
 AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
 AC_CONFIG_AUX_DIR([.])
 
+: ${CFLAGS=""} # We don't want -g -O2
+
 # Checks for host and target systems.
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
 AM_INIT_AUTOMAKE()
 AC_PREREQ(2.60)
-AC_CONFIG_SRCDIR([grub-core/include/grub/dl.h])
+AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config.h])
 
 grub_coredir='grub-core'
@@ -51,12 +53,31 @@ AC_SUBST(grub_utildir)
 m4_include([configure.common])
 
 # Output files.
+grub_CHECK_LINK_DIR
+if test x"$link_dir" = xyes ; then
+  AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
+  mkdir -p grub-core/lib
+  cp -rp $srcdir/grub-core/lib/$target_cpu grub-core/lib/target_cpu
+  if test "$platform" != emu ; then
+    AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
+  fi
+else
+  mkdir -p include/grub 2>/dev/null
+  rm -rf include/grub/cpu
+  cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
+  cp -rp $srcdir/grub-core/lib/$target_cpu grub-core/lib/target_cpu 2>/dev/null
+  if test "$platform" != emu ; then
+    rm -rf include/grub/machine
+    cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
+  fi
+fi
+
 AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([grub-core/Makefile])
 AC_CONFIG_FILES([po/Makefile])
 AC_CONFIG_FILES([docs/Makefile])
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 
-AC_CONFIG_SUBDIRS([grub-core])
 AC_OUTPUT
 [
 echo "*******************************************************"

gentpl.py

@@ -222,8 +222,8 @@ def-[+ name +].lst: [+ name +].module$(EXEEXT)
 und-[+ name +].lst: [+ name +].module$(EXEEXT)
 	$(NM) -u -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@
 
-mod-[+ name +].c: [+ name +].module$(EXEEXT) $(top_builddir)/moddep.lst $(top_srcdir)/genmodsrc.sh
+mod-[+ name +].c: [+ name +].module$(EXEEXT) moddep.lst genmodsrc.sh
-	sh $(top_srcdir)/genmodsrc.sh [+ name +] $(top_builddir)/moddep.lst > $@ || (rm -f $@; exit 1)
+	sh $(srcdir)/genmodsrc.sh [+ name +] moddep.lst > $@ || (rm -f $@; exit 1)
 
 mod-[+ name +].o: mod-[+ name +].c
 	$(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS_MODULE) $(CPPFLAGS) $(CFLAGS_MODULE) $(CFLAGS) -c -o $@ $<
@@ -239,26 +239,26 @@ mod-[+ name +].o: mod-[+ name +].c
 	  $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; \
 	fi
 
-command-[+ name +].lst: [+ name +].pp $(top_srcdir)/gencmdlist.sh
+command-[+ name +].lst: [+ name +].pp $(srcdir)/gencmdlist.sh
-	cat $< | sh $(top_srcdir)/gencmdlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+	cat $< | sh $(srcdir)/gencmdlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-fs-[+ name +].lst: [+ name +].pp $(top_srcdir)/genfslist.sh
+fs-[+ name +].lst: [+ name +].pp $(srcdir)/genfslist.sh
-	cat $< | sh $(top_srcdir)/genfslist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+	cat $< | sh $(srcdir)/genfslist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-video-[+ name +].lst: [+ name +].pp $(top_srcdir)/genvideolist.sh
+video-[+ name +].lst: [+ name +].pp $(srcdir)/genvideolist.sh
-	cat $< | sh $(top_srcdir)/genvideolist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+	cat $< | sh $(srcdir)/genvideolist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-partmap-[+ name +].lst: [+ name +].pp $(top_srcdir)/genpartmaplist.sh
+partmap-[+ name +].lst: [+ name +].pp $(srcdir)/genpartmaplist.sh
-	cat $< | sh $(top_srcdir)/genpartmaplist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+	cat $< | sh $(srcdir)/genpartmaplist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-parttool-[+ name +].lst: [+ name +].pp $(top_srcdir)/genparttoollist.sh
+parttool-[+ name +].lst: [+ name +].pp $(srcdir)/genparttoollist.sh
-	cat $< | sh $(top_srcdir)/genparttoollist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+	cat $< | sh $(srcdir)/genparttoollist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-handler-[+ name +].lst: [+ name +].pp $(top_srcdir)/genhandlerlist.sh
+handler-[+ name +].lst: [+ name +].pp $(srcdir)/genhandlerlist.sh
-	cat $< | sh $(top_srcdir)/genhandlerlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+	cat $< | sh $(srcdir)/genhandlerlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-terminal-[+ name +].lst: [+ name +].pp $(top_srcdir)/genterminallist.sh
+terminal-[+ name +].lst: [+ name +].pp $(srcdir)/genterminallist.sh
-	cat $< | sh $(top_srcdir)/genterminallist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+	cat $< | sh $(srcdir)/genterminallist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 """
     return r
 

grub-core/Makefile.am

@@ -1,6 +1,9 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-SUBDIRS = po
+CC=$(TARGET_CC)
+CPP=$(TARGET_CC)
+CCAS=$(TARGET_CC)
+
 EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
 EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
 EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
@@ -8,7 +11,88 @@ EXTRA_DIST += genpartmaplist.sh genparttoollist.sh genterminallist.sh
 EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
 EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
 
-include $(top_srcdir)/Makefile.vars
+grubconfdir = $(sysconfdir)/grub.d
+platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
+
+# to calm down automake
+BUILT_SOURCES =
+CLEANFILES =
+COMMAND_FILES =
+DEF_FILES =
+FS_FILES =
+HANDLER_FILES =
+IMG_FILES =
+MOD_FILES =
+MODULE_FILES =
+PARTMAP_FILES =
+PARTTOOL_FILES =
+TERMINAL_FILES =
+TESTS =
+UND_FILES =
+VIDEO_FILES =
+bin_PROGRAMS =
+bin_SCRIPTS =
+check_PROGRAMS =
+check_SCRIPTS =
+grubconf_DATA =
+grubconf_SCRIPTS =
+man_MANS =
+noinst_DATA =
+noinst_LIBRARIES =
+noinst_PROGRAMS =
+pkglib_SCRIPTS =
+platform_DATA =
+sbin_PROGRAMS =
+sbin_SCRIPTS =
+KERNEL_HEADER_FILES =
+
+# Platform specific options
+if COND_i386_pc
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_efi
+  LDFLAGS_PLATFORM = -melf_i386
+endif
+if COND_x86_64_efi
+  LDFLAGS_PLATFORM = -melf_x86_64
+endif
+if COND_i386_qemu
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_coreboot
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_ieee1275
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_mips_yeeloong
+  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+  CCASFLAGS_PLATFORM = -march=mips3
+endif
+if COND_sparc64_ieee1275
+  CFLAGS_PLATFORM = -mno-app-regs
+  LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
+endif
+
+CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
+CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
+CPPFLAGS_GRUB += -I$(top_srcdir)/include
+CPPFLAGS_GRUB += -I$(top_builddir)/include
+CCASFLAGS_GRUB = -DASM_FILE=1
+
+CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
+CPPFLAGS_GCRY = -I$(top_srcdir)/$(grub_coredir)/lib/libgcrypt_wrap
+
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
+CPPFLAGS_GNULIB = -I$(top_srcdir)/$(grub_coredir)/gnulib
+
+CFLAGS_MKISOFS = -Wno-all -Werror
+CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
+
+CFLAGS_POSIX = -fno-builtin
+CPPFLAGS_POSIX = -I$(top_srcdir)/$(grub_coredir)/lib/posix_wrap
+
+CPPFLAGS_EFIEMU = -I$(top_srcdir)/$(grub_coredir)/efiemu/runtime
 
 LDADD_KERNEL = -lgcc
 CFLAGS_KERNEL = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
@@ -41,30 +125,231 @@ AM_CPPFLAGS = $(CPPFLAGS_GRUB)
 AM_CCASFLAGS = $(CCASFLAGS_GRUB)
 
 # gentrigtables
-gentrigtables: $(top_srcdir)/gentrigtables.c
+gentrigtables: gentrigtables.c
 	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(CPPFLAGS) -lm $<
 CLEANFILES += gentrigtables
 
 # trigtables.c
-trigtables.c: gentrigtables.c configure.ac
+trigtables.c: gentrigtables.c $(top_srcdir)/configure.ac
 	$(MAKE) $(AM_MAKEFLAGS) gentrigtables
-	$(top_builddir)/gentrigtables > $@
+	$(builddir)/gentrigtables > $@
 CLEANFILES += trigtables.c
 
 # XXX Use Automake's LEX & YACC support
-grub_script.tab.h: $(top_srcdir)/script/parser.y
+grub_script.tab.h: script/parser.y
-	$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/script/parser.y
+	$(YACC) -d -p grub_script_yy -b grub_script $<
 grub_script.tab.c: grub_script.tab.h
 CLEANFILES += grub_script.tab.c grub_script.tab.h
 
 # For the lexer.
-grub_script.yy.h: $(top_srcdir)/script/yylex.l
+grub_script.yy.h: script/yylex.l
-	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/script/yylex.l
+	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $<
 grub_script.yy.c: grub_script.yy.h
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
 include $(srcdir)/modules.am
-include $(srcdir)/Makefile.kernel
+
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elf.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elfload.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/reader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/symbol.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/types.h
+
+if COND_i386_pc
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/biosdisk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vga.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vbe.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pxe.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+endif
+
+if COND_i386_efi
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+endif
+
+if COND_i386_coreboot
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+endif
+
+if COND_i386_multiboot
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+endif
+
+if COND_i386_qemu
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
+endif
+
+if COND_i386_ieee1275
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
+endif
+
+if COND_x86_64_efi
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+endif
+
+if COND_mips_yeeloong
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap_scale.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
+endif
+
+if COND_powerpc_ieee1275
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+endif
+
+if COND_sparc64_ieee1275
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h
+endif
+
+if COND_emu
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/time.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/types.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gzio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/menu.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
+if COND_GRUB_EMU_SDL
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h
+endif
+if COND_GRUB_EMU_USB
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libusb.h
+endif
+if COND_GRUB_EMU_PCI
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libpciaccess.h
+endif
+endif
+
+symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES)
+	@list='$^'; \
+	for p in $$list; do \
+	  echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \
+	done
+CLEANFILES += symlist.h
+BUILT_SOURCES += symlist.h
+
+symlist.c: symlist.h gensymlist.sh
+	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
+	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+	rm -f symlist.p
+CLEANFILES += symlist.c
+BUILT_SOURCES += symlist.c
+
+noinst_DATA += kernel_syms.lst
+kernel_syms.lst: $(KERNEL_HEADER_FILES) $(top_builddir)/config.h
+	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
+	if grep "^#define HAVE_ASM_USCORE" $(top_builddir)/config.h; then u="_"; else u=""; fi; \
+	cat kernel_syms.input | grep -v '^#' | sed -n \
+	  -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+	  -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+	  | sort -u >$@
+	rm -f kernel_syms.input
+CLEANFILES += kernel_syms.lst
+
+if COND_emu
+kern/emu/grub_emu-main.$(OBJEXT):grub_emu_init.h
+grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h
+kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h
+grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h
+
+grub_emu_init.h: genemuinitheader.sh $(MOD_FILES)
+	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(NM) > $@
+CLEANFILES += grub_emu_init.h
+
+grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES)
+	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
+CLEANFILES += grub_emu_init.c
+endif
 
 # .lst files
 platform_DATA += moddep.lst
@@ -77,9 +362,6 @@ platform_DATA += parttool.lst
 platform_DATA += video.lst
 platform_DATA += crypto.lst
 CLEANFILES += moddep.lst
-CLEANFILES += fs.lst
-CLEANFILES += command.lst
-CLEANFILES += partmap.lst
 CLEANFILES += handler.lst
 CLEANFILES += terminal.lst
 CLEANFILES += parttool.lst
@@ -88,27 +370,41 @@ CLEANFILES += crypto.lst
 
 fs.lst: $(FS_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += fs.lst
+
 command.lst: $(COMMAND_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += command.lst
+
 partmap.lst: $(PARTMAP_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += partmap.lst
+
 handler.lst: $(HANDLER_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += handler.lst
+
 terminal.lst: $(TERMINAL_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += terminal.lst
+
 parttool.lst: $(PARTTOOL_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += parttool.lst
+
 video.lst: $(VIDEO_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += video.lst
 
 # but, crypto.lst is simply copied
-crypto.lst: $(top_srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
+crypto.lst: $(srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
 	cp $^ $@
+CLEANFILES += crypto.lst
 
 # generate global module dependencies list
 moddep.lst: kernel_syms.lst genmoddep.awk $(DEF_FILES) $(UND_FILES)
 	cat $(DEF_FILES) kernel_syms.lst /dev/null \
-	  | $(AWK) -f $(top_srcdir)/genmoddep.awk $(UND_FILES) > $@ \
+	  | $(AWK) -f $(srcdir)/genmoddep.awk $(UND_FILES) > $@ \
 	  || (rm -f $@; exit 1)
 
 if COND_i386_pc

grub-core/Makefile.kernel

@@ -1,168 +1,168 @@
 # -*- makefile -*-
 
 KERNEL_HEADER_FILES =
-KERNEL_HEADER_FILES += include/grub/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h
-KERNEL_HEADER_FILES += include/grub/command.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
-KERNEL_HEADER_FILES += include/grub/device.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
-KERNEL_HEADER_FILES += include/grub/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
-KERNEL_HEADER_FILES += include/grub/dl.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
-KERNEL_HEADER_FILES += include/grub/elf.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elf.h
-KERNEL_HEADER_FILES += include/grub/elfload.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elfload.h
-KERNEL_HEADER_FILES += include/grub/env.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
-KERNEL_HEADER_FILES += include/grub/env_private.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
-KERNEL_HEADER_FILES += include/grub/err.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
-KERNEL_HEADER_FILES += include/grub/file.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h
-KERNEL_HEADER_FILES += include/grub/fs.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
-KERNEL_HEADER_FILES += include/grub/i18n.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
-KERNEL_HEADER_FILES += include/grub/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
-KERNEL_HEADER_FILES += include/grub/list.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
-KERNEL_HEADER_FILES += include/grub/misc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
-KERNEL_HEADER_FILES += include/grub/mm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
-KERNEL_HEADER_FILES += include/grub/net.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
-KERNEL_HEADER_FILES += include/grub/parser.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
-KERNEL_HEADER_FILES += include/grub/partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
-KERNEL_HEADER_FILES += include/grub/reader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/reader.h
-KERNEL_HEADER_FILES += include/grub/symbol.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/symbol.h
-KERNEL_HEADER_FILES += include/grub/term.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
-KERNEL_HEADER_FILES += include/grub/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
-KERNEL_HEADER_FILES += include/grub/types.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/types.h
 
 if COND_i386_pc
-KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/biosdisk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/biosdisk.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/machine/vga.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vga.h
-KERNEL_HEADER_FILES += include/grub/machine/vbe.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vbe.h
-KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += include/grub/machine/pxe.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pxe.h
-KERNEL_HEADER_FILES += include/grub/i386/pit.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_i386_efi
-KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
-KERNEL_HEADER_FILES += include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-KERNEL_HEADER_FILES += include/grub/i386/pit.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_i386_coreboot
-KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
 endif
 
 if COND_i386_multiboot
-KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
 endif
 
 if COND_i386_qemu
-KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
 endif
 
 if COND_i386_ieee1275
-KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/terminfo.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
 endif
 
 if COND_x86_64_efi
-KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
-KERNEL_HEADER_FILES += include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/i386/pit.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_mips_yeeloong
-KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/cpu/cache.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
-KERNEL_HEADER_FILES += include/grub/bitmap.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap.h
-KERNEL_HEADER_FILES += include/grub/video.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
-KERNEL_HEADER_FILES += include/grub/gfxterm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
-KERNEL_HEADER_FILES += include/grub/font.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
-KERNEL_HEADER_FILES += include/grub/bitmap_scale.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap_scale.h
-KERNEL_HEADER_FILES += include/grub/bufio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
-KERNEL_HEADER_FILES += include/grub/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
-KERNEL_HEADER_FILES += include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
-KERNEL_HEADER_FILES += include/grub/cs5536.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
-KERNEL_HEADER_FILES += include/grub/machine/pci.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
 endif
 
 if COND_powerpc_ieee1275
-KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
 endif
 
 if COND_sparc64_ieee1275
-KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
-KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += include/grub/sparc64/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h
 endif
 
 if COND_emu
-KERNEL_HEADER_FILES += include/grub/cpu/time.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/time.h
-KERNEL_HEADER_FILES += include/grub/cpu/types.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/types.h
-KERNEL_HEADER_FILES += include/grub/gzio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gzio.h
-KERNEL_HEADER_FILES += include/grub/menu.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/menu.h
-KERNEL_HEADER_FILES += include/grub/datetime.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
-KERNEL_HEADER_FILES += include/grub/emu/misc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
 if COND_GRUB_EMU_SDL
-KERNEL_HEADER_FILES += include/grub/sdl.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h
 endif
 if COND_GRUB_EMU_USB
-KERNEL_HEADER_FILES += include/grub/libusb.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libusb.h
 endif
 if COND_GRUB_EMU_PCI
-KERNEL_HEADER_FILES += include/grub/libpciaccess.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libpciaccess.h
 endif
 endif
 
-symlist.h: config.h $(KERNEL_HEADER_FILES)
+symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES)
 	@list='$^'; \
 	for p in $$list; do \
 	  echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \
@@ -172,15 +172,15 @@ BUILT_SOURCES += symlist.h
 
 symlist.c: symlist.h gensymlist.sh
 	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
-	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
 	rm -f symlist.p
 CLEANFILES += symlist.c
 BUILT_SOURCES += symlist.c
 
 noinst_DATA += kernel_syms.lst
-kernel_syms.lst: $(KERNEL_HEADER_FILES) config.h
+kernel_syms.lst: $(KERNEL_HEADER_FILES) $(top_builddir)/config.h
 	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
-	if grep "^#define HAVE_ASM_USCORE" config.h; then u="_"; else u=""; fi; \
+	if grep "^#define HAVE_ASM_USCORE" $(top_builddir)/config.h; then u="_"; else u=""; fi; \
 	cat kernel_syms.input | grep -v '^#' | sed -n \
 	  -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
 	  -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \

grub-core/Makefile.vars

@@ -33,8 +33,8 @@ endif
 
 CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
 CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
-CPPFLAGS_GRUB += -I$(top_srcdir)/$(grub_coredir)/include
+CPPFLAGS_GRUB += -I$(top_srcdir)/include
-CPPFLAGS_GRUB += -I$(top_builddir)/$(grub_coredir)/include
+CPPFLAGS_GRUB += -I$(top_builddir)/include
 CCASFLAGS_GRUB = -DASM_FILE=1
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers