[ros-diffs] [sserapion] 44786: Fix broken merge

Author: sserapion
Date: Mon Dec 28 04:02:12 2009
New Revision: 44786

URL: http://svn.reactos.org/svn/reactos?rev=44786&view=rev
Log:
Fix broken merge

Modified:
    branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1]
Mon Dec 28 04:02:12 2009
@@ -263,7 +263,7 @@
 	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H
${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call
RBUILD_intermediate_path_noext,$(2)}_c.c $(2)
 	$${checkpoint} $$@>$(NUL)
 
-endef
+${call RBUILD_CC,$(1),${call
RBUILD_intermediate_path_noext,$(2)}_c.c,,-fno-unit-at-a-time,${call
RBUILD_intermediate_path_noext,$(2)}_c.o}endef
 
 #(module, source, dependencies, cflags)
 define RBUILD_WIDL_SERVER_RULE
@@ -277,7 +277,7 @@
 	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H
${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call
RBUILD_intermediate_path_noext,$(2)}_s.c $(2)
 	$${checkpoint} $$@>$(NUL)
 
-endef
+${call RBUILD_CC,$(1),${call
RBUILD_intermediate_path_noext,$(2)}_s.c,,-fno-unit-at-a-time,${call
RBUILD_intermediate_path_noext,$(2)}_s.o}endef
 
 #(module, source, dependencies, cflags)
 define RBUILD_WIDL_PROXY_RULE
@@ -291,7 +291,7 @@
 	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H
${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call
RBUILD_intermediate_path_noext,$(2)}_p.c $(2)
 	$${checkpoint} $$@>$(NUL)
 
-endef
+${call RBUILD_CC,$(1),${call
RBUILD_intermediate_path_noext,$(2)}_p.c,,-fno-unit-at-a-time,${call
RBUILD_intermediate_path_noext,$(2)}_p.o}endef
 
 #(module, source, dependencies, cflags)
 define RBUILD_WIDL_INTERFACE_RULE