- Merge 45172, 45291, 45356, 45404, 45546 from trunk

svn path=/branches/aicom-network-stable/; revision=45589

CREDITS

@@ -16,7 +16,7 @@ Daniel Reimer <reimer.daniel@freenet.de>
 David Welch <welch@cwcom.net>
 Dmitry Chapyshev <dmitry@reactos.org>
 Emanuele Aliberti <ea@iol.it>
-Eric Kohl
+Eric Kohl <ekohl@rz-online.de>
 Eugene Ingerman <geneing@myrealbox.com>
 Filip Navara <xnavara@volny.cz>
 Frederik Leemans
@@ -31,7 +31,7 @@ Hartmut Birr <hartmut.birr@gmx.de>
 Hernan Ochoa
 Herve Poussineau <hpoussin@reactos.com>
 Iwan Fatahi <i_fatahi@hotmail.com>
-James Tabor <james.tabor@reactos.org> <jimtabor.rosdev@gmail.com> <jamestabor_rosdev@yahoo.com>
+James B. Tabor <jimtabor.rosdev@gmail.com> <jimtabor@adsl-64-217-116-74.dsl.hstntx.swbell.net>
 Jason Eager
 Jason Filby <jasonfilby@yahoo.com>
 Jason Weiler
@@ -66,7 +66,7 @@ Royce Mitchell III <royce3@ev1.net>
 Samuel Serapión <samdwise51@gmail.com>
 Saveliy Tretiakov <saveliyt@mail.ru>
 Stefan Ginsberg <stefan__100__@hotmail.com>
-Steven Edwards <winehacker@gmail.com>
+Steven Edwards <steven_ed4153@yahoo.com>
 Thomas Weidenmueller <w3seek@users.sourceforge.net>
 Timo Kreuzer <timo.kreuzer@reactos.org>
 Victor Kirhenshtein <sauros@iname.com>

Makefile

@@ -169,11 +169,7 @@ else
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-  ifeq ($(ARCH),i386)
-    ROS_AUTOMAKE=makefile.auto
-  else
-    ROS_AUTOMAKE=makefile-$(ARCH).auto
-  endif
+  ROS_AUTOMAKE=makefile-$(ARCH).auto
 endif
 
 all: $(ROS_AUTOMAKE)

ReactOS-generic.rbuild

@@ -120,11 +120,6 @@
 		<compilerflag>-Wno-strict-aliasing</compilerflag>
 		<compilerflag>-Wpointer-arith</compilerflag>
 		<compilerflag>-Wno-multichar</compilerflag>
-		<!--
-		<compilerflag>-Wno-error=uninitialized</compilerflag>
-		<compilerflag>-Wno-error=unused-function</compilerflag>
-		<compilerflag>-Wno-error=write-strings</compilerflag>
-		-->
 		<!-- compilerflag>-H</compilerflag>    enable this for header traces -->
 	</group>
 

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" />