put windows-detection code in makefile, don't make proxy.mak silent Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/proxy.mak _____
Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-12 04:11:24 UTC (rev 13951) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-12 04:14:09 UTC (rev 13952) @@ -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 ifeq ($(VERBOSE),no) Q = @ @@ -87,11 +104,6 @@ NUL = NUL endif
-.PHONY: all -.PHONY: clean - -all: makefile.auto - ifneq ($(ROS_INTERMEDIATE),) $(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE) ${nmkdir} $(ROS_INTERMEDIATE)tools _____
Modified: branches/xmlbuildsystem/reactos/proxy.mak --- branches/xmlbuildsystem/reactos/proxy.mak 2005-03-12 04:11:24 UTC (rev 13951) +++ branches/xmlbuildsystem/reactos/proxy.mak 2005-03-12 04:14:09 UTC (rev 13952) @@ -1,4 +1,4 @@
-MAKEFLAGS += --no-print-directory --silent +MAKEFLAGS += --no-print-directory
$(DEFAULT): @$(MAKE) -C $(TOP) $(DEFAULT)