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

put windows-detection code in makefile, don't make proxy.mak silent

Browse source 
svn path=/branches/xmlbuildsystem/; revision=13952
This commit is contained in:
Royce Mitchell III 2005-03-12 04:14:09 +00:00
parent b62f2bb179
commit af64b1423c
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
reactos/Makefile
View file

@ -1,3 +1,20 @@
.PHONY: all
.PHONY: clean
all: makefile.auto
ifeq ($(HOST),)
OSDETECT=$(word 1,$(shell gcc -dumpmachine))
all: detect_os
detect_os:
ifeq ($(OSDETECT),mingw32)
HOST=mingw32-windows
else
HOST=mingw32-linux
endif
endif
# Default to half-verbose mode # Default to half-verbose mode
ifeq ($(VERBOSE),no) ifeq ($(VERBOSE),no)
Q = @ Q = @
@ -87,11 +104,6 @@ else # mingw32-windows
NUL = NUL NUL = NUL
endif endif
.PHONY: all
.PHONY: clean
all: makefile.auto
ifneq ($(ROS_INTERMEDIATE),) ifneq ($(ROS_INTERMEDIATE),)
$(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE) $(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE)
${nmkdir} $(ROS_INTERMEDIATE)tools ${nmkdir} $(ROS_INTERMEDIATE)tools

2
reactos/proxy.mak
View file

@ -1,4 +1,4 @@
MAKEFLAGS += --no-print-directory --silent MAKEFLAGS += --no-print-directory
$(DEFAULT): $(DEFAULT):
@$(MAKE) -C $(TOP) $(DEFAULT) @$(MAKE) -C $(TOP) $(DEFAULT)