[ros-diffs] [cfinck] 34536: Revert r34533 (except the nice indentation in the Makefile) for unbreaking trunk. This change is also not compatible with current cleaning scripts in RosBE and on the Buildslaves (which only delete "makefile.auto"), leading to possibly unclean builds if the generated makefile wouldn't be deleted. The ultimate goal would be putting the generated makefiles into the intermediate directories, so we also save one cleaning step.

[cfinck at svn.reactos.org]

Author: cfinck
Date: Tue Jul 15 17:04:16 2008
New Revision: 34536

URL: http://svn.reactos.org/svn/reactos?rev=34536&view=rev
Log:
Revert r34533 (except the nice indentation in the Makefile) for unbreaking trunk.

This change is also not compatible with current cleaning scripts in RosBE and on the Buildslaves (which only delete "makefile.auto"), leading to possibly unclean builds if the generated makefile wouldn't be deleted.
The ultimate goal would be putting the generated makefiles into the intermediate directories, so we also save one cleaning step.

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=34536&r1=34535&r2=34536&view=diff
==============================================================================
--- trunk/reactos/Makefile [iso-8859-1] (original)
+++ trunk/reactos/Makefile [iso-8859-1] Tue Jul 15 17:04:16 2008
@@ -125,7 +125,7 @@
 #            -r           Input XML
 #
 #    ROS_AUTOMAKE
-#        Alternate name of makefile-$(ARCH).auto
+#        Alternate name of makefile.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-$(ARCH).auto
+ROS_AUTOMAKE=makefile.auto
 endif
 
 all: $(ROS_AUTOMAKE)

Modified: trunk/reactos/ReactOS-arm.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=34536&r1=34535&r2=34536&view=diff
==============================================================================
--- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Tue Jul 15 17:04:16 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile-arm.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile.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=34536&r1=34535&r2=34536&view=diff
==============================================================================
--- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Tue Jul 15 17:04:16 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile.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=34536&r1=34535&r2=34536&view=diff
==============================================================================
--- trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] Tue Jul 15 17:04:16 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile-ppc.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config-ppc.rbuild">
 		<xi:fallback>
 			<xi:include href="config-ppc.template.rbuild" />