[ros-diffs] [hpoussin] 34533: Rename makefile.auto to makefile-$(ARCH).auto

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Tue Jul 15 15:42:08 2008
New Revision: 34533

URL: http://svn.reactos.org/svn/reactos?rev=34533&view=rev
Log:
Rename makefile.auto to makefile-$(ARCH).auto

Modified:
    trunk/reactos/Makefile
    trunk/reactos/ReactOS-arm.rbuild
    trunk/reactos/ReactOS-i386.rbuild
    trunk/reactos/ReactOS-ppc.rbuild

Modified: trunk/reactos/Makefile
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=34533&r1=34532&r2=34533&view=diff
==============================================================================
--- trunk/reactos/Makefile [iso-8859-1] (original)
+++ trunk/reactos/Makefile [iso-8859-1] Tue Jul 15 15:42:08 2008
@@ -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 @@
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-ROS_AUTOMAKE=makefile.auto
+ROS_AUTOMAKE=makefile-$(ARCH).auto
 endif
 
 all: $(ROS_AUTOMAKE)
@@ -167,20 +167,20 @@
 .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

Modified: trunk/reactos/ReactOS-arm.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=34533&r1=34532&r2=34533&view=diff
==============================================================================
--- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Tue Jul 15 15:42:08 2008
@@ -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" />

Modified: trunk/reactos/ReactOS-i386.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=34533&r1=34532&r2=34533&view=diff
==============================================================================
--- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Tue Jul 15 15:42:08 2008
@@ -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" />

Modified: trunk/reactos/ReactOS-ppc.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=34533&r1=34532&r2=34533&view=diff
==============================================================================
--- trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] Tue Jul 15 15:42:08 2008
@@ -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" />