From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Apr 2010 12:29:11 +0000 (+0200)
Subject: Move files to appropriate places
X-Git-Tag: 1.99~990^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9cd257a873c889e763a3785efcfa2710ac13f8f;p=thirdparty%2Fgrub.git

Move files to appropriate places
---

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 79a8e430b..3d7f42804 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -33,15 +33,13 @@ setpci_mod_CFLAGS = $(COMMON_CFLAGS)
 setpci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += multiboot.mod
-multiboot_mod_SOURCES = loader/i386/multiboot.c \
-			loader/i386/multiboot_mbi.c
+multiboot_mod_SOURCES = loader/multiboot.c loader/i386/multiboot_mbi.c
 multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
 multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
 pkglib_MODULES += multiboot2.mod
-multiboot2_mod_SOURCES = loader/i386/multiboot.c \
-			 loader/i386/multiboot_mbi2.c
+multiboot2_mod_SOURCES = loader/multiboot.c loader/multiboot_mbi2.c
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 1776a5d18..c9d94eb74 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -31,8 +31,8 @@ relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += multiboot2.mod
-multiboot2_mod_SOURCES = loader/i386/multiboot.c \
-			 loader/i386/multiboot_mbi2.c
+multiboot2_mod_SOURCES = loader/multiboot.c \
+			 loader/multiboot_mbi2.c
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/loader/i386/multiboot.c b/loader/multiboot.c
similarity index 100%
rename from loader/i386/multiboot.c
rename to loader/multiboot.c
diff --git a/loader/i386/multiboot_elfxx.c b/loader/multiboot_elfxx.c
similarity index 100%
rename from loader/i386/multiboot_elfxx.c
rename to loader/multiboot_elfxx.c
diff --git a/loader/i386/multiboot_mbi2.c b/loader/multiboot_mbi2.c
similarity index 100%
rename from loader/i386/multiboot_mbi2.c
rename to loader/multiboot_mbi2.c