[PSDK]

[reactos.git] / reactos / Makefile

diff --git a/reactos/Makefile b/reactos/Makefile
index 17f8a54..07148d0 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -169,11 +169,7 @@ else
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-  ifeq ($(ARCH),i386)
-    ROS_AUTOMAKE=makefile.auto
-  else
-    ROS_AUTOMAKE=makefile-$(ARCH).auto
-  endif
+  ROS_AUTOMAKE=makefile-$(ARCH).auto
 endif
 
 all: $(ROS_AUTOMAKE)
@@ -315,31 +311,31 @@ host_objcopy = $(Q)objcopy
 
 # Set target compiler/linker
 ifneq ($(ROS_PREFIX),)
-  PREFIX_ := $(ROS_PREFIX)
+  PREFIX_ := $(ROS_PREFIX)-
 else
   ifeq ($(HOST),mingw32-linux)
-    PREFIX_ := mingw32
+    PREFIX_ := mingw32-
   else
     PREFIX_ :=
   endif
 endif
 ifeq ($(TARGET_CC),)
-  TARGET_CC = $(PREFIX_)-gcc
+  TARGET_CC = $(PREFIX_)gcc
 endif
 ifeq ($(TARGET_CPP),)
-  TARGET_CPP = $(PREFIX_)-g++
+  TARGET_CPP = $(PREFIX_)g++
 endif
 gcc = $(Q)$(TARGET_CC)
 gpp = $(Q)$(TARGET_CPP)
 gas = $(Q)$(TARGET_CC) -x assembler-with-cpp
-ld = $(Q)$(PREFIX_)-ld
-nm = $(Q)$(PREFIX_)-nm
-objdump = $(Q)$(PREFIX_)-objdump
-ar = $(Q)$(PREFIX_)-ar
-objcopy = $(Q)$(PREFIX_)-objcopy
-dlltool = $(Q)$(PREFIX_)-dlltool
-strip = $(Q)$(PREFIX_)-strip
-windres = $(Q)$(PREFIX_)-windres
+ld = $(Q)$(PREFIX_)ld
+nm = $(Q)$(PREFIX_)nm
+objdump = $(Q)$(PREFIX_)objdump
+ar = $(Q)$(PREFIX_)ar
+objcopy = $(Q)$(PREFIX_)objcopy
+dlltool = $(Q)$(PREFIX_)dlltool
+strip = $(Q)$(PREFIX_)strip
+windres = $(Q)$(PREFIX_)windres
 
 # Set utilities
 ifeq ($(OSTYPE),msys)
@@ -476,11 +472,6 @@ rgenstat: $(RGENSTAT_TARGET)
        $(ECHO_RGENSTAT)
        $(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml
 
-.PHONY: cb
-cb: $(ROS_BUILDENGINE)
-       $(ECHO_RBUILD)
-       $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb
-
 .PHONY: msbuild
 msbuild: $(ROS_BUILDENGINE)
        $(ECHO_RBUILD)