Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 05:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert r34533 (except the nice indentation in the Makefile) for unbreaking trunk.

Browse source 
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
This commit is contained in:
Colin Finck 2008-07-15 22:04:16 +00:00
parent 7d8bcb4fd9
commit a9fabb5fd5
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/Makefile
View file

@ -125,7 +125,7 @@
# -r Input XML # -r Input XML
# #
# ROS_AUTOMAKE # ROS_AUTOMAKE
# Alternate name of makefile-$(ARCH).auto # Alternate name of makefile.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,7 @@ else
endif endif
ifeq ($(ROS_AUTOMAKE),) ifeq ($(ROS_AUTOMAKE),)
ROS_AUTOMAKE=makefile-$(ARCH).auto ROS_AUTOMAKE=makefile.auto
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-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: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-i386.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-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:include href="config.rbuild">
<xi:fallback> <xi:fallback>
<xi:include href="config.template.rbuild" /> <xi:include href="config.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.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:include href="config-ppc.rbuild">
<xi:fallback> <xi:fallback>
<xi:include href="config-ppc.template.rbuild" /> <xi:include href="config-ppc.template.rbuild" />