Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-13 01:22:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Apply again r34533: rename autogenerated makefile to makefile-$(ARCH).auto,

Browse source 
except for i386, due to a bug in RosBE which cleans only makefile.auto and not makefile*.auto

svn path=/trunk/; revision=34789
This commit is contained in:
Hervé Poussineau 2008-07-25 19:07:36 +00:00
parent d62f18210a
commit 9ba8702be9
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/Makefile
View file

@ -38,7 +38,7 @@
# This can require several minutes to complete. If you only need to check # 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 # dependencies for a single or few modules then you can use the
# module_depends targets instead. This target can also repair a damaged or # 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 # module_depends
# These targets do a dependency check of individual modules. Replace module # These targets do a dependency check of individual modules. Replace module
@ -125,7 +125,7 @@
# -r Input XML # -r Input XML
# #
# ROS_AUTOMAKE # ROS_AUTOMAKE
# Alternate name of makefile.auto # Alternate name of makefile-${ROS_ARCH}.auto
# #
# ROS_BUILDENGINE # ROS_BUILDENGINE
# The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET) # The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET)
@ -158,7 +158,11 @@ else
endif endif
ifeq ($(ROS_AUTOMAKE),) ifeq ($(ROS_AUTOMAKE),)
ROS_AUTOMAKE=makefile.auto ifeq ($(ARCH),i386)
ROS_AUTOMAKE=makefile.auto
else
ROS_AUTOMAKE=makefile-$(ARCH).auto
endif
endif endif
all: $(ROS_AUTOMAKE) all: $(ROS_AUTOMAKE)

2
reactos/ReactOS-arm.rbuild
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <!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:include href="config-arm.rbuild">
<xi:fallback> <xi:fallback>
<xi:include href="config-arm.template.rbuild" /> <xi:include href="config-arm.template.rbuild" />

2
reactos/ReactOS-ppc.rbuild
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <!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:include href="config-ppc.rbuild">
<xi:fallback> <xi:fallback>
<xi:include href="config-ppc.template.rbuild" /> <xi:include href="config-ppc.template.rbuild" />