Revert r34533 (except the nice indentation in the Makefile) for unbreaking trunk.
authorColin Finck <colin@reactos.org>
Tue, 15 Jul 2008 22:04:16 +0000 (22:04 +0000)
committerColin Finck <colin@reactos.org>
Tue, 15 Jul 2008 22:04:16 +0000 (22:04 +0000)
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.

svn path=/trunk/; revision=34536

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

index 68eb661..7f5be7a 100644 (file)
 #            -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 @@ else
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-ROS_AUTOMAKE=makefile-$(ARCH).auto
+ROS_AUTOMAKE=makefile.auto
 endif
 
 all: $(ROS_AUTOMAKE)
index 076e4e3..6fb0a76 100644 (file)
@@ -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" />
index 0789a43..e3d4528 100644 (file)
@@ -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" />
index 170c417..343b753 100644 (file)
@@ -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" />