From ed8c0887f40197dc98d97c99ecb2e45b9d4e3c60 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 10 Oct 2013 09:47:39 +0200
Subject: [PATCH] 	* conf/Makefile.extra-dist: Fix extra-dist list. 
 * grub-core/Makefile.core.def: Likewise.

---
 ChangeLog                   |  5 ++++
 conf/Makefile.extra-dist    | 53 ++++++++++++++++++++++++++-----------
 grub-core/Makefile.core.def |  1 +
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6254963e7..7488735f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/Makefile.extra-dist: Fix extra-dist list.
+	* grub-core/Makefile.core.def: Likewise.
+
 2013-10-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi: Document disk names used on Windows and AROS.
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index a32472556..237473bc3 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -62,20 +62,41 @@ EXTRA_DIST += m4/uintmax_t.m4
 EXTRA_DIST += m4/visibility.m4
 EXTRA_DIST += m4/math_h.m4
 
-EXTRA_DIST += grub-core/kern/emu/hostdisk_apple.c
-EXTRA_DIST += grub-core/kern/emu/hostdisk_basic.c
-EXTRA_DIST += grub-core/kern/emu/hostdisk_bsd.c
-EXTRA_DIST += grub-core/kern/emu/hostdisk_freebsd.c
-EXTRA_DIST += grub-core/kern/emu/hostdisk_hurd.c
-EXTRA_DIST += grub-core/kern/emu/hostdisk_linux.c
-EXTRA_DIST += grub-core/kern/emu/hostdisk_windows.c
-EXTRA_DIST += grub-core/kern/emu/hostdisk_sun.c
+EXTRA_DIST += grub-core/osdep/apple/hostdisk.c
+EXTRA_DIST += grub-core/osdep/aros/hostdisk.c
+EXTRA_DIST += grub-core/osdep/basic/hostdisk.c
+EXTRA_DIST += grub-core/osdep/bsd/hostdisk.c
+EXTRA_DIST += grub-core/osdep/freebsd/hostdisk.c
+EXTRA_DIST += grub-core/osdep/hurd/hostdisk.c
+EXTRA_DIST += grub-core/osdep/linux/hostdisk.c
+EXTRA_DIST += grub-core/osdep/windows/hostdisk.c
+EXTRA_DIST += grub-core/osdep/sun/hostdisk.c
+
+EXTRA_DIST += grub-core/osdep/apple/getroot.c
+EXTRA_DIST += grub-core/osdep/aros/getroot.c
+EXTRA_DIST += grub-core/osdep/basic/getroot.c
+EXTRA_DIST += grub-core/osdep/bsd/getroot.c
+EXTRA_DIST += grub-core/osdep/windows/getroot.c
+EXTRA_DIST += grub-core/osdep/freebsd/getroot.c
+EXTRA_DIST += grub-core/osdep/hurd/getroot.c
+EXTRA_DIST += grub-core/osdep/linux/getroot.c
+EXTRA_DIST += grub-core/osdep/sun/getroot.c
+
+EXTRA_DIST += grub-core/osdep/basic/emunet.c
+EXTRA_DIST += grub-core/osdep/basic/random.c
+EXTRA_DIST += grub-core/osdep/basic/ofpath.c
+
+EXTRA_DIST += grub-core/osdep/unix/password.c
+EXTRA_DIST += grub-core/osdep/unix/random.c
+EXTRA_DIST += grub-core/osdep/unix/sleep.c
+
+EXTRA_DIST += grub-core/osdep/linux/emunet.c
+EXTRA_DIST += grub-core/osdep/linux/ofpath.c
+
+EXTRA_DIST += grub-core/osdep/windows/password.c
+EXTRA_DIST += grub-core/osdep/windows/random.c
+EXTRA_DIST += grub-core/osdep/windows/sleep.c
+
+EXTRA_DIST += tests/dfly-mbr-mbexample.mbr.img.gz
+EXTRA_DIST += tests/dfly-mbr-mbexample.dfly.img.gz
 
-EXTRA_DIST += util/getroot_apple.c
-EXTRA_DIST += util/getroot_basic.c
-EXTRA_DIST += util/getroot_bsd.c
-EXTRA_DIST += util/getroot_windows.c
-EXTRA_DIST += util/getroot_freebsd.c
-EXTRA_DIST += util/getroot_hurd.c
-EXTRA_DIST += util/getroot_linux.c
-EXTRA_DIST += util/getroot_sun.c
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 218d2e48e..d00a21ba8 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -233,6 +233,7 @@ kernel = {
   arm = kern/arm/dl_helper.c;
   arm = kern/arm/cache_armv6.S;
   arm = kern/arm/cache_armv7.S;
+  extra_dist = kern/arm/cache.S;
   arm = kern/arm/cache.c;
   arm = kern/arm/misc.S;