Rename makefile.auto to makefile-$(ARCH).auto
authorHervé Poussineau <hpoussin@reactos.org>
Tue, 15 Jul 2008 20:42:08 +0000 (20:42 +0000)
committerHervé Poussineau <hpoussin@reactos.org>
Tue, 15 Jul 2008 20:42:08 +0000 (20:42 +0000)
svn path=/trunk/; revision=34533

reactos/Makefile
reactos/ReactOS-arm.rbuild
reactos/ReactOS-i386.rbuild
reactos/ReactOS-ppc.rbuild

index 7cd62c1..68eb661 100644 (file)
 #            -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
index 6fb0a76..076e4e3 100644 (file)
@@ -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" />
index e3d4528..0789a43 100644 (file)
@@ -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" />
index 343b753..170c417 100644 (file)
@@ -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" />