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

Rename makefile.auto to makefile-$(ARCH).auto

Browse source 
svn path=/trunk/; revision=34533
This commit is contained in:
Hervé Poussineau 2008-07-15 20:42:08 +00:00
parent 01824511d8
commit d1a689916c
4 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
reactos/Makefile
View file

@ -125,7 +125,7 @@
# -r Input XML # -r Input XML
# #
# ROS_AUTOMAKE # ROS_AUTOMAKE
# Alternate name of makefile.auto # Alternate name of makefile-$(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,7 @@ else
endif endif
ifeq ($(ROS_AUTOMAKE),) ifeq ($(ROS_AUTOMAKE),)
ROS_AUTOMAKE=makefile.auto ROS_AUTOMAKE=makefile-$(ARCH).auto
endif endif
all: $(ROS_AUTOMAKE) all: $(ROS_AUTOMAKE)
@ -167,20 +167,20 @@ all: $(ROS_AUTOMAKE)
.SUFFIXES: .SUFFIXES:
ifeq ($(HOST),) ifeq ($(HOST),)
ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
export OSTYPE = msys export OSTYPE = msys
HOST=mingw32-linux HOST=mingw32-linux
HOST_CFLAGS+=-fshort-wchar HOST_CFLAGS+=-fshort-wchar
HOST_CPPFLAGS+=-fshort-wchar HOST_CPPFLAGS+=-fshort-wchar
else else
HOST=mingw32-windows HOST=mingw32-windows
endif endif
else else
HOST=mingw32-linux HOST=mingw32-linux
HOST_CFLAGS+=-fshort-wchar HOST_CFLAGS+=-fshort-wchar
HOST_CPPFLAGS+=-fshort-wchar HOST_CPPFLAGS+=-fshort-wchar
endif endif
endif endif
# Default to half-verbose mode # Default to half-verbose mode

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-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.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <project name="ReactOS" makefile="makefile-i386.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" 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" />