[ros-diffs] [sserapion] 34804: Merge 34789, make appropriate changes to ReactOS-amd64.rbuild

Author: sserapion
Date: Sat Jul 26 03:21:51 2008
New Revision: 34804

URL: http://svn.reactos.org/svn/reactos?rev=34804&view=rev
Log:
Merge 34789, make appropriate changes to ReactOS-amd64.rbuild

Modified:
    branches/ros-amd64-bringup/reactos/Makefile
    branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild
    branches/ros-amd64-bringup/reactos/ReactOS-arm.rbuild
    branches/ros-amd64-bringup/reactos/ReactOS-ppc.rbuild

Modified: branches/ros-amd64-bringup/reactos/Makefile
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/Makef…
==============================================================================
--- branches/ros-amd64-bringup/reactos/Makefile [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/Makefile [iso-8859-1] Sat Jul 26 03:21:51 2008
@@ -38,7 +38,7 @@
 #        This can require several minutes to complete. If you only need to check
 #        dependencies for a single or few modules then you can use the
 #        module_depends targets instead. This target can also repair a damaged or
-#        missing makefile-{ROS_ARCH}.auto if needed.
+#        missing makefile-${ROS_ARCH}.auto if needed.
 #
 #    module_depends
 #        These targets do a dependency check of individual modules. Replace module
@@ -125,7 +125,7 @@
 #            -r           Input XML
 #
 #    ROS_AUTOMAKE
-#        Alternate name of makefile.auto
+#        Alternate name of makefile-${ROS_ARCH}.auto
 #
 #    ROS_BUILDENGINE
 #        The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET)
@@ -158,7 +158,11 @@
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-ROS_AUTOMAKE=makefile.auto
+  ifeq ($(ARCH),i386)
+    ROS_AUTOMAKE=makefile.auto
+  else
+    ROS_AUTOMAKE=makefile-$(ARCH).auto
+  endif
 endif
 
 all: $(ROS_AUTOMAKE)

Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sat Jul 26
03:21:51 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-amd64.auto"
xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config-amd64.rbuild">
 		<xi:fallback>
 			<xi:include href="config-amd64.template.rbuild" />

Modified: branches/ros-amd64-bringup/reactos/ReactOS-arm.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ReactOS-arm.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ReactOS-arm.rbuild [iso-8859-1] Sat Jul 26 03:21:51
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: branches/ros-amd64-bringup/reactos/ReactOS-ppc.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ReactOS-ppc.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ReactOS-ppc.rbuild [iso-8859-1] Sat Jul 26 03:21:51
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" />