- Correct the ulAssemblyRosterIndex member of ACTCTX_SECTION_KEYED_DATA -- it is...

[reactos.git] / reactos / Makefile

diff --git a/reactos/Makefile b/reactos/Makefile
index 68eb661..69ac106 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -38,7 +38,7 @@
 #        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
 #        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
 #        These targets do a dependency check of individual modules. Replace module
@@ -125,7 +125,7 @@
 #            -r           Input XML
 #
 #    ROS_AUTOMAKE
-#        Alternate name of makefile-$(ARCH).auto
+#        Alternate name of makefile-${ROS_ARCH}.auto
 #
 #    ROS_BUILDENGINE
 #        The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET)
@@ -158,7 +158,11 @@ else
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-ROS_AUTOMAKE=makefile-$(ARCH).auto
+  ifeq ($(ARCH),i386)
+    ROS_AUTOMAKE=makefile.auto
+  else
+    ROS_AUTOMAKE=makefile-$(ARCH).auto
+  endif
 endif
 
 all: $(ROS_AUTOMAKE)
@@ -167,20 +171,20 @@ all: $(ROS_AUTOMAKE)
 .SUFFIXES:
 
 ifeq ($(HOST),)
-       ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
-               ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
-                       export OSTYPE = msys
-                       HOST=mingw32-linux
-                       HOST_CFLAGS+=-fshort-wchar
-                       HOST_CPPFLAGS+=-fshort-wchar
-               else
-                       HOST=mingw32-windows
-               endif
-       else
-               HOST=mingw32-linux
-               HOST_CFLAGS+=-fshort-wchar
-               HOST_CPPFLAGS+=-fshort-wchar
-       endif
+ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+export OSTYPE = msys
+HOST=mingw32-linux
+HOST_CFLAGS+=-fshort-wchar
+HOST_CPPFLAGS+=-fshort-wchar
+else
+HOST=mingw32-windows
+endif
+else
+HOST=mingw32-linux
+HOST_CFLAGS+=-fshort-wchar
+HOST_CPPFLAGS+=-fshort-wchar
+endif
 endif
 
 # Default to half-verbose mode
@@ -210,16 +214,22 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_BUILDNO =@echo $(QUOTE)[BUILDNO]  $@$(QUOTE)
   ECHO_INVOKE  =@echo $(QUOTE)[INVOKE]   $<$(QUOTE)
   ECHO_PCH     =@echo $(QUOTE)[PCH]      $@$(QUOTE)
+  ECHO_CPP     =@echo $(QUOTE)[CPP]      $@$(QUOTE)
   ECHO_CC      =@echo $(QUOTE)[CC]       $<$(QUOTE)
+  ECHO_HOSTCC  =@echo $(QUOTE)[HOST-CC]  $<$(QUOTE)
+  ECHO_CL      =@echo $(QUOTE)[CL]       $<$(QUOTE)
   ECHO_GAS     =@echo $(QUOTE)[GAS]      $<$(QUOTE)
   ECHO_NASM    =@echo $(QUOTE)[NASM]     $<$(QUOTE)
   ECHO_AR      =@echo $(QUOTE)[AR]       $@$(QUOTE)
+  ECHO_HOSTAR  =@echo $(QUOTE)[HOST-AR]  $@$(QUOTE)
   ECHO_WINEBLD =@echo $(QUOTE)[WINEBLD]  $@$(QUOTE)
   ECHO_WRC     =@echo $(QUOTE)[WRC]      $@$(QUOTE)
   ECHO_WIDL    =@echo $(QUOTE)[WIDL]     $@$(QUOTE)
   ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES]  $<$(QUOTE)
   ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL]  $@$(QUOTE)
   ECHO_LD      =@echo $(QUOTE)[LD]       $@$(QUOTE)
+  ECHO_HOSTLD  =@echo $(QUOTE)[HOST-LD]  $@$(QUOTE)
+  ECHO_LINK    =@echo $(QUOTE)[LINK]     $@$(QUOTE)
   ECHO_NM      =@echo $(QUOTE)[NM]       $@$(QUOTE)
   ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP]  $@$(QUOTE)
   ECHO_RBUILD  =@echo $(QUOTE)[RBUILD]   $@$(QUOTE)
@@ -240,16 +250,20 @@ else
   ECHO_BUILDNO =
   ECHO_INVOKE  =
   ECHO_PCH     =
+  ECHO_CPP     =
   ECHO_CC      =
+  ECHO_HOSTCC  =
   ECHO_GAS     =
   ECHO_NASM    =
   ECHO_AR      =
+  ECHO_HOSTAR  =
   ECHO_WINEBLD =
   ECHO_WRC     =
   ECHO_WIDL    =
   ECHO_BIN2RES =
   ECHO_DLLTOOL =
   ECHO_LD      =
+  ECHO_HOSTLD  =
   ECHO_NM      =
   ECHO_OBJDUMP =
   ECHO_RBUILD  =
@@ -305,6 +319,8 @@ objcopy = $(Q)$(PREFIX_)objcopy
 dlltool = $(Q)$(PREFIX_)dlltool
 strip = $(Q)$(PREFIX_)strip
 windres = $(Q)$(PREFIX_)windres
+cl = $(Q)cl -nologo
+link = $(Q)link -nologo
 
 # Set utilities
 ifeq ($(OSTYPE),msys)
@@ -434,9 +450,6 @@ universe:
                ROS_OUTPUT=output-$(ARCH)-r \
                world
 
-sysregtest:
-       $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg
-
 .PHONY: rgenstat
 rgenstat: $(RGENSTAT_TARGET)
        $(ECHO_RGENSTAT)