From 9ba8702be9da713c500591be3c390c49095e1931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Fri, 25 Jul 2008 19:07:36 +0000 Subject: [PATCH] Apply again r34533: rename autogenerated makefile to makefile-$(ARCH).auto, except for i386, due to a bug in RosBE which cleans only makefile.auto and not makefile*.auto svn path=/trunk/; revision=34789 --- reactos/Makefile | 10 +++++++--- reactos/ReactOS-arm.rbuild | 2 +- reactos/ReactOS-ppc.rbuild | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/reactos/Makefile b/reactos/Makefile index 7cd62c11504..dc823d59275 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -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 @@ else 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) diff --git a/reactos/ReactOS-arm.rbuild b/reactos/ReactOS-arm.rbuild index 14c9c2f0fd6..a75411a2ec0 100644 --- a/reactos/ReactOS-arm.rbuild +++ b/reactos/ReactOS-arm.rbuild @@ -1,6 +1,6 @@ - + diff --git a/reactos/ReactOS-ppc.rbuild b/reactos/ReactOS-ppc.rbuild index 343b7539fcf..170c41717a2 100644 --- a/reactos/ReactOS-ppc.rbuild +++ b/reactos/ReactOS-ppc.rbuild @@ -1,6 +1,6 @@ - +