From d1a689916cc8198b3bdef46c0f1f4d2f37f104a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Tue, 15 Jul 2008 20:42:08 +0000
Subject: [PATCH] Rename makefile.auto to makefile-$(ARCH).auto

svn path=/trunk/; revision=34533
---
 reactos/Makefile            | 32 ++++++++++++++++----------------
 reactos/ReactOS-arm.rbuild  |  2 +-
 reactos/ReactOS-i386.rbuild |  2 +-
 reactos/ReactOS-ppc.rbuild  |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/reactos/Makefile b/reactos/Makefile
index 7cd62c11504..68eb6613aca 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -125,7 +125,7 @@
 #            -r           Input XML
 #
 #    ROS_AUTOMAKE
-#        Alternate name of makefile.auto
+#        Alternate name of makefile-$(ARCH).auto
 #
 #    ROS_BUILDENGINE
 #        The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET)
@@ -158,7 +158,7 @@ else
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-ROS_AUTOMAKE=makefile.auto
+ROS_AUTOMAKE=makefile-$(ARCH).auto
 endif
 
 all: $(ROS_AUTOMAKE)
@@ -167,20 +167,20 @@ all: $(ROS_AUTOMAKE)
 .SUFFIXES:
 
 ifeq ($(HOST),)
-ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
-ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
-export OSTYPE = msys
-HOST=mingw32-linux
-HOST_CFLAGS+=-fshort-wchar
-HOST_CPPFLAGS+=-fshort-wchar
-else
-HOST=mingw32-windows
-endif
-else
-HOST=mingw32-linux
-HOST_CFLAGS+=-fshort-wchar
-HOST_CPPFLAGS+=-fshort-wchar
-endif
+	ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
+		ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+			export OSTYPE = msys
+			HOST=mingw32-linux
+			HOST_CFLAGS+=-fshort-wchar
+			HOST_CPPFLAGS+=-fshort-wchar
+		else
+			HOST=mingw32-windows
+		endif
+	else
+		HOST=mingw32-linux
+		HOST_CFLAGS+=-fshort-wchar
+		HOST_CPPFLAGS+=-fshort-wchar
+	endif
 endif
 
 # Default to half-verbose mode
diff --git a/reactos/ReactOS-arm.rbuild b/reactos/ReactOS-arm.rbuild
index 6fb0a76fcd5..076e4e3ee39 100644
--- a/reactos/ReactOS-arm.rbuild
+++ b/reactos/ReactOS-arm.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile-arm.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config-arm.rbuild">
 		<xi:fallback>
 			<xi:include href="config-arm.template.rbuild" />
diff --git a/reactos/ReactOS-i386.rbuild b/reactos/ReactOS-i386.rbuild
index e3d45283b02..0789a431b73 100644
--- a/reactos/ReactOS-i386.rbuild
+++ b/reactos/ReactOS-i386.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config.rbuild">
 		<xi:fallback>
 			<xi:include href="config.template.rbuild" />
diff --git a/reactos/ReactOS-ppc.rbuild b/reactos/ReactOS-ppc.rbuild
index 343b7539fcf..170c41717a2 100644
--- a/reactos/ReactOS-ppc.rbuild
+++ b/reactos/ReactOS-ppc.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile-ppc.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config-ppc.rbuild">
 		<xi:fallback>
 			<xi:include href="config-ppc.template.rbuild" />