From a9fabb5fd5aa578fd7694251e1fa1d16f8a9b7d0 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Tue, 15 Jul 2008 22:04:16 +0000 Subject: [PATCH] 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. svn path=/trunk/; revision=34536 --- reactos/Makefile | 4 ++-- reactos/ReactOS-arm.rbuild | 2 +- reactos/ReactOS-i386.rbuild | 2 +- reactos/ReactOS-ppc.rbuild | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reactos/Makefile b/reactos/Makefile index 68eb6613aca..7f5be7aca6f 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -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 @@ else endif ifeq ($(ROS_AUTOMAKE),) -ROS_AUTOMAKE=makefile-$(ARCH).auto +ROS_AUTOMAKE=makefile.auto endif all: $(ROS_AUTOMAKE) diff --git a/reactos/ReactOS-arm.rbuild b/reactos/ReactOS-arm.rbuild index 076e4e3ee39..6fb0a76fcd5 100644 --- a/reactos/ReactOS-arm.rbuild +++ b/reactos/ReactOS-arm.rbuild @@ -1,6 +1,6 @@ - + diff --git a/reactos/ReactOS-i386.rbuild b/reactos/ReactOS-i386.rbuild index 0789a431b73..e3d45283b02 100644 --- a/reactos/ReactOS-i386.rbuild +++ b/reactos/ReactOS-i386.rbuild @@ -1,6 +1,6 @@ - + diff --git a/reactos/ReactOS-ppc.rbuild b/reactos/ReactOS-ppc.rbuild index 170c41717a2..343b7539fcf 100644 --- a/reactos/ReactOS-ppc.rbuild +++ b/reactos/ReactOS-ppc.rbuild @@ -1,6 +1,6 @@ - + -- 2.17.1