From 12b88bedcbb6e07853f7f800a6cabb15b6071fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Mon, 3 Sep 2007 04:12:48 +0000
Subject: [PATCH] Few indentation fixes Generate again boot programs in output
 directory

svn path=/trunk/; revision=28800
---
 .../rbuild/backend/mingw/modulehandler.cpp    | 20 ++++++++++---------
 .../rbuild/backend/mingw/modulehandler.h      |  2 +-
 reactos/tools/rbuild/module.cpp               | 18 ++++++++---------
 reactos/tools/rbuild/rbuild.h                 |  2 +-
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 8ef64ee20cf..91a5ecbfb25 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -267,9 +267,9 @@ MingwModuleHandler::InstanciateHandler (
 		case EmbeddedTypeLib:
 			handler = new MingwEmbeddedTypeLibModuleHandler ( module );
 			break;
-                case ElfExecutable:
-                        handler = new MingwElfExecutableModuleHandler ( module );
-                        break;
+		case ElfExecutable:
+			handler = new MingwElfExecutableModuleHandler ( module );
+			break;
 		default:
 			throw UnknownModuleTypeException (
 				module.node.location,
@@ -2002,6 +2002,8 @@ MingwModuleHandler::GenerateOtherMacros ()
 		globalCflags += " -pipe";
 	if ( !module.allowWarnings )
 		globalCflags += " -Werror";
+	if ( module.host == HostTrue )
+		globalCflags += " $(HOST_CFLAGS)";
 
 	// Always force disabling of sibling calls optimisation for GCC
 	// (TODO: Move to version-specific once this bug is fixed in GCC)
@@ -3149,8 +3151,8 @@ MingwBootProgramModuleHandler::GenerateBootProgramModuleTarget ()
 	fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" );
 
 	fprintf ( fMakefile, "\t$(%s_PREPARE) $(OUTPUT)$(SEP)%s %s\n",
-		  module.buildtype.c_str (), 
-		  NormalizeFilename( payload->GetPath() ).c_str (),
+		module.buildtype.c_str (), 
+		NormalizeFilename( payload->GetPath() ).c_str (),
 		junk_cpy.c_str () );
 
 	fprintf ( fMakefile, "\t${objcopy} $(%s_FLATFORMAT) %s %s\n",
@@ -3726,8 +3728,8 @@ MingwElfExecutableModuleHandler::Process ()
 	fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" );
 
 	fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -g -o %s\n",
-		  module.buildtype.c_str(),
-		  objectsMacro.c_str(),
-                  libsMacro.c_str(),
-                  targetMacro.c_str () );
+	          module.buildtype.c_str(),
+	          objectsMacro.c_str(),
+	          libsMacro.c_str(),
+	          targetMacro.c_str () );
 }
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index e68f858b6c5..d1309d32589 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -518,7 +518,7 @@ public:
 class MingwElfExecutableModuleHandler : public MingwModuleHandler
 {
 public:
-        MingwElfExecutableModuleHandler ( const Module& module );
+	MingwElfExecutableModuleHandler ( const Module& module );
 	virtual HostType DefaultHost() { return HostFalse; }
 	virtual void Process ();
 };
diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index 7cd17984eb9..bee1039fd95 100644
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -892,8 +892,8 @@ Module::GetModuleType ( const string& location, const XMLAttribute& attribute )
 		return IdlHeader;
 	if ( attribute.value == "embeddedtypelib" )
 		return EmbeddedTypeLib;
-        if ( attribute.value == "elfexecutable" )
-                return ElfExecutable;
+	if ( attribute.value == "elfexecutable" )
+		return ElfExecutable;
 	throw InvalidAttributeValueException ( location,
 	                                       attribute.name,
 	                                       attribute.value );
@@ -942,7 +942,7 @@ Module::GetDefaultModuleExtension () const
 		case RpcClient:
 			return ".o";
 		case Alias:
-                case ElfExecutable:
+		case ElfExecutable:
 		case IdlHeader:
 			return "";
 		case EmbeddedTypeLib:
@@ -995,7 +995,7 @@ Module::GetDefaultModuleEntrypoint () const
 		case Alias:
 		case BootProgram:
 		case IdlHeader:
-                case ElfExecutable:
+		case ElfExecutable:
 		case EmbeddedTypeLib:
 			return "";
 	}
@@ -1024,8 +1024,8 @@ Module::GetDefaultModuleBaseaddress () const
 		case KernelModeDLL:
 		case KernelModeDriver:
 			return "0x00010000";
-                case ElfExecutable:
-                        return "0xe00000";                        
+		case ElfExecutable:
+			return "0xe00000";
 		case BuildTool:
 		case StaticLibrary:
 		case ObjectLibrary:
@@ -1085,7 +1085,7 @@ Module::IsDLL () const
 		case Alias:
 		case IdlHeader:
 		case EmbeddedTypeLib:
-                case ElfExecutable:
+		case ElfExecutable:
 			return false;
 	}
 	throw InvalidOperationException ( __FILE__,
@@ -1111,19 +1111,19 @@ Module::GenerateInOutputTree () const
 		case BuildTool:
 		case BootLoader:
 		case BootSector:
+		case BootProgram:
 		case Iso:
 		case LiveIso:
 		case IsoRegTest:
 		case LiveIsoRegTest:
 		case EmbeddedTypeLib:
-                case ElfExecutable:
+		case ElfExecutable:
 			return true;
 		case StaticLibrary:
 		case ObjectLibrary:
 		case RpcServer:
 		case RpcClient:
 		case Alias:
-		case BootProgram:
 		case IdlHeader:
 			return false;
 	}
diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h
index b5d8a13fae8..617d257b6d9 100644
--- a/reactos/tools/rbuild/rbuild.h
+++ b/reactos/tools/rbuild/rbuild.h
@@ -275,7 +275,7 @@ enum ModuleType
 	IsoRegTest = 24,
 	LiveIsoRegTest = 25,
 	EmbeddedTypeLib = 26,
-        ElfExecutable = 27
+	ElfExecutable = 27
 };
 
 enum HostType