[ros-diffs] [hyperion] 44000: Don't uppercase module name in _TARGET macros. This commit will amazingly not trigger a full rebuild

Author: hyperion
Date: Sat Nov  7 16:20:45 2009
New Revision: 44000

URL: http://svn.reactos.org/svn/reactos?rev=44000&view=rev
Log:
Don't uppercase module name in _TARGET macros. This commit will amazingly not trigger
a full rebuild

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak
    trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    trunk/reactos/tools/rbuild/backend/mingw/rules.mak

Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] Sat Nov  7
16:20:45 2009
@@ -15,7 +15,7 @@
 
 BUILTIN_CPPFLAGS+= /X
 
-cl=$(Q)$(RBUILD_HELPER_TARGET) "RBUILD_CL_" "$(notdir $<)" cl
/nologo
+cl=$(Q)$(rbuild_helper_TARGET) "RBUILD_CL_" "$(notdir $<)" cl
/nologo
 
 #(module, source, dependencies, cflags, output)
 #TODO
@@ -31,7 +31,7 @@
 #(module, source, dependencies, cflags, output)
 define RBUILD_CL_CPP
 
-$(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)}
+$(5): $(2) $(3) $$(rbuild_helper_TARGET) | ${call RBUILD_dir,$(5)}
 	$$(ECHO_CPP)
 	${call RBUILD_PIPE_CL_CPP,$$<,$(4)} > $$@
 
@@ -50,13 +50,13 @@
 ${call RBUILD_DEPENDS,$(1),$(2),,${call RBUILD_cflags,$(1),$(4)},$(5).d}
 -include $(5).d
 
-$(5): $(2) $(5).d $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)}
+$(5): $(2) $(5).d $(3) $$(rbuild_helper_TARGET) | ${call RBUILD_dir,$(5)}
 	$$(ECHO_CC)
 	$${cl} /TC /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cflags,$(1),$(4)} /c $$<
 
 else
 
-$(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)}
+$(5): $(2) $(3) $$(rbuild_helper_TARGET) | ${call RBUILD_dir,$(5)}
 	$$(ECHO_CC)
 	$${cl} /TC /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cflags,$(1),$(4)} /c $$<
 
@@ -74,13 +74,13 @@
 ${call RBUILD_CXX_DEPENDS,$(1),$(2),,${call RBUILD_cflags,$(1),$(4)},$(5).d}
 -include $(5).d
 
-$(5): $(2) $(5).d $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)}
+$(5): $(2) $(5).d $(3) $$(rbuild_helper_TARGET) | ${call RBUILD_dir,$(5)}
 	$$(ECHO_CC)
 	$${cl} /TP /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cxxflags,$(1),$(4)} /c $$<
 
 else
 
-$(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)}
+$(5): $(2) $(3) $$(rbuild_helper_TARGET) | ${call RBUILD_dir,$(5)}
 	$$(ECHO_CC)
 	$${cl} /TP /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cxxflags,$(1),$(4)} /c $$<
 

Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Sat Nov  7
16:20:45 2009
@@ -1,1 +1,32 @@
-# TODO
+#~ #(module, objs, deps, ldflags, output, libs, subsys, entry, base, falign, salign)
+#~ define RBUILD_LINK
+
+#~ $(5) ${call RBUILD_output_dir,$(5)}$$(SEP)$(basename $(notdir $(5))).map: $(2) $(3)
$(6) | ${call RBUILD_dir,$(5)}
+	#~ $$(ECHO_CC)
+	#~ $${ld} -subsystem=$(7) -entry=$(8) -base=$(9) -file-alignment=$(10)
-section-alignment=$(11) $(2) $(6) ${call RBUILD_ldflags,$(1),$(4)} -o $(5)
+#~ ifeq ($(ROS_BUILDMAP),full)
+	#~ $$(ECHO_OBJDUMP)
+	#~ $${objdump} -d -S $$@ > ${call RBUILD_output_dir,$(5)}$$(SEP)$(basename $(notdir
$(5))).map
+#~ else
+#~ ifeq ($(ROS_BUILDMAP),yes)
+	#~ $$(ECHO_NM)
+	#~ $${nm} --numeric-sort $$@ > ${call RBUILD_output_dir,$(5)}$$(SEP)$(basename
$(notdir $(5))).map
+#~ endif
+#~ endif
+#~ ifeq ($(ROS_BUILDNOSTRIP),yes)
+	#~ $$(ECHO_CP)
+	#~ $${cp} $(5) $(basename $(5)).nostrip$(suffix $(5)) 1>$(NUL)
+#~ endif
+#~ ifneq ($(ROS_GENERATE_RSYM),no)
+	#~ $$(ECHO_RSYM)
+	#~ $$(Q)$$(rsym_TARGET) $$@ $$@
+#~ endif
+#~ ifeq ($(ROS_LEAN_AND_MEAN),yes)
+	#~ $$(ECHO_STRIP)
+	#~ $${strip} -s -x -X $$@
+#~ endif
+
+#~ endef
+
+#~ #(module, dependencies, ldflags, subsys, entry, base, falign, salign)
+#~ RBUILD_LINK_RULE=${call
RBUILD_LINK,$(1),$(1)_OBJS,$(2),$(3),$(1)_TARGET,$(1)_LIBS,$(4),$(5),$(6),$(7),$(8)}

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Nov  7
16:20:45 2009
@@ -63,7 +63,6 @@
 GetTargetMacro ( const Module& module, bool with_dollar )
 {
 	string s ( module.name );
-	strupr ( &s[0] );
 	s += "_TARGET";
 	if ( with_dollar )
 		return ssprintf ( "$(%s)", s.c_str() );
@@ -1157,9 +1156,9 @@
                 "$(intermediate_dir)$(SEP)", NULL );
 
 /* TODO: move these to rules.mak */
-Rule wmcRule ( "$(intermediate_path_noext).rc
$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h: $(WMC_TARGET)
$(source) | $(intermediate_dir)\n"
+Rule wmcRule ( "$(intermediate_path_noext).rc
$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h: $(wmc_TARGET)
$(source) | $(intermediate_dir)\n"
                "\t$(ECHO_WMC)\n"
-               "\t$(Q)$(WMC_TARGET) -i -H
$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h -o
$(intermediate_path_noext).rc $(source)\n",
+               "\t$(Q)$(wmc_TARGET) -i -H
$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h -o
$(intermediate_path_noext).rc $(source)\n",
                "$(intermediate_path_noext).rc",
               
"$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h",
                "$(intermediate_dir)$(SEP)", NULL );
@@ -1485,8 +1484,8 @@
 
 	string linkerScriptArgument;
 	if ( module.linkerScript != NULL )
-		linkerScriptArgument = ssprintf ( " -T %s", backend->GetFullName (
*module.linkerScript->file ).c_str () );
-	else
+			linkerScriptArgument = ssprintf ( " -T %s", backend->GetFullName (
*module.linkerScript->file ).c_str () );
+		else
 		linkerScriptArgument = "";
 
 	/* check if we need to add default C++ libraries, ie if we have
@@ -1944,7 +1943,7 @@
 		module.name.c_str () );
 	string dependencies = GetTargetMacro ( module );
 	if ( module.type == Test )
-		dependencies += " $(REGTESTS_RUN_TARGET)";
+		dependencies += " $(regtests_run_TARGET)";
 	fprintf ( fMakefile, "%s: %s\n\n",
 		module.name.c_str (),
 		dependencies.c_str () );
@@ -2064,17 +2063,17 @@
 	if (module.name != "psdk" &&
 		module.name != "dxsdk")
 	{
-		dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" );
-		dependencies.push_back ( "$(DXSDK_TARGET) $(dxsdk_HEADERS)" );
+		dependencies.push_back ( "$(psdk_TARGET) $(psdk_HEADERS)" );
+		dependencies.push_back ( "$(dxsdk_TARGET) $(dxsdk_HEADERS)" );
 	}
 
 	if (module.name != "errcodes" &&
 		module.name != "bugcodes" &&
 		module.name != "ntstatus")
 	{
-		dependencies.push_back ( "$(ERRCODES_TARGET) $(ERRCODES_MCHEADERS)" );
-		dependencies.push_back ( "$(BUGCODES_TARGET) $(BUGCODES_MCHEADERS)" );
-		dependencies.push_back ( "$(NTSTATUS_TARGET) $(NTSTATUS_MCHEADERS)" );
+		dependencies.push_back ( "$(errcodes_TARGET) $(ERRCODES_MCHEADERS)" );
+		dependencies.push_back ( "$(bugcodes_TARGET) $(BUGCODES_MCHEADERS)" );
+		dependencies.push_back ( "$(ntstatus_TARGET) $(NTSTATUS_MCHEADERS)" );
 	}
 
 	///* Check if any dependent library relies on the generated headers */
@@ -3138,16 +3137,16 @@
 
 	fprintf ( fMakefile, ".PHONY: %s_CABINET\n\n",
 	          module.name.c_str () );
-	fprintf ( fMakefile, "%s_CABINET: all $(CABMAN_TARGET) %s | %s\n",
+	fprintf ( fMakefile, "%s_CABINET: all $(cabman_TARGET) %s | %s\n",
 	          module.name.c_str (),
 	          backend->GetFullName ( reactosDff ).c_str (),
 	          backend->GetFullPath ( bootcdReactos ).c_str () );
 	fprintf ( fMakefile,
-	          "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n",
+	          "\t$(Q)$(cabman_TARGET) -C %s -L %s -I -P $(OUTPUT)\n",
 	          backend->GetFullName ( reactosDff ).c_str (),
 	          backend->GetFullPath ( bootcdReactos ).c_str () );
 	fprintf ( fMakefile,
-	          "\t$(Q)$(CABMAN_TARGET) -C %s -RC %s -L %s -N -P $(OUTPUT)\n",
+	          "\t$(Q)$(cabman_TARGET) -C %s -RC %s -L %s -N -P $(OUTPUT)\n",
 	          backend->GetFullName ( reactosDff ).c_str (),
 	          backend->GetFullName ( reactosInf ).c_str (),
 	          backend->GetFullPath ( bootcdReactos ).c_str ());
@@ -3167,7 +3166,7 @@
 	fprintf ( fMakefile, ".PHONY: %s\n\n",
 	          module.name.c_str ());
 	fprintf ( fMakefile,
-	          "%s: $(%s_OBJS) %s_CABINET %s $(CDMAKE_TARGET) | %s\n",
+	          "%s: $(%s_OBJS) %s_CABINET %s $(cdmake_TARGET) | %s\n",
 	          module.name.c_str (),
 	          module.name.c_str (),
 	          module.name.c_str (),
@@ -3178,7 +3177,7 @@
 
 	fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );
 	fprintf ( fMakefile,
-	          "\t$(Q)$(CDMAKE_TARGET) -v -j -m -b %s %s REACTOS %s\n",
+	          "\t$(Q)$(cdmake_TARGET) -v -j -m -b %s %s REACTOS %s\n",
 	          backend->GetFullName ( *isoboot ).c_str (),
 	          backend->GetFullPath ( bootcd ).c_str (),
 	          IsoName.c_str() );
@@ -3299,7 +3298,7 @@
 	fprintf ( fMakefile,
 	          "\t$(ECHO_MKHIVE)\n" );
 	fprintf ( fMakefile,
-	          "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%clivecd.inf
boot%cbootdata%chiveinst_$(ARCH).inf\n",
+	          "\t$(mkhive_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%clivecd.inf
boot%cbootdata%chiveinst_$(ARCH).inf\n",
 	          cSep, backend->GetFullPath ( reactosSystem32ConfigDirectory ).c_str (),
 	          cSep, cSep, cSep, cSep );
 }
@@ -3357,7 +3356,7 @@
 	fprintf ( fMakefile, ".PHONY: %s\n\n",
 	          module.name.c_str ());
 	fprintf ( fMakefile,
-	          "%s : $(%s_OBJS) %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n",
+	          "%s : $(%s_OBJS) %s %s $(mkhive_TARGET) $(cdmake_TARGET)\n",
 	          module.name.c_str (),
 	          module.name.c_str (),
 	          backend->GetFullName ( *isoboot) .c_str (),
@@ -3367,7 +3366,7 @@
 	OutputRegistryCommands ( livecdDirectory );
 	fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );
 	fprintf ( fMakefile,
-	          "\t$(Q)$(CDMAKE_TARGET) -v -m -j -b %s %s REACTOS %s\n",
+	          "\t$(Q)$(cdmake_TARGET) -v -m -j -b %s %s REACTOS %s\n",
 	          backend->GetFullName( *isoboot ).c_str (),
 	          backend->GetFullPath ( livecd ).c_str (),
 	          IsoName.c_str() );
@@ -3456,13 +3455,13 @@
 	GenerateRules ();
 
 	const FileLocation *target_file = GetTargetFilename ( module, NULL );
-	fprintf ( fMakefile, "%s: $(CABMAN_TARGET) | %s\n",
+	fprintf ( fMakefile, "%s: $(cabman_TARGET) | %s\n",
 	          targetMacro.c_str (),
 	          backend->GetFullPath ( *target_file ).c_str () );
 
 	fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" );
 	fprintf ( fMakefile,
-	          "\t$(Q)$(CABMAN_TARGET) -M raw -S %s $(%s_SOURCES)\n",      //
Escape the asterisk for Make
+	          "\t$(Q)$(cabman_TARGET) -M raw -S %s $(%s_SOURCES)\n",      //
Escape the asterisk for Make
 	          targetMacro.c_str (),
 			  module.name.c_str());
 }

Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Sat Nov  7 16:20:45
2009
@@ -8,12 +8,15 @@
 
 #(source)
 RBUILD_intermediate_path_noext=${call RBUILD_intermediate_dir,$(1)}$(SEP)$(basename
$(notdir $(1)))
+RBUILD_output_path_noext=${call RBUILD_output_dir,$(1)}$(SEP)$(basename $(notdir $(1)))
 
 #(module, source)
 RBUILD_intermediate_path_unique=${call RBUILD_intermediate_path_noext,$(2)}_$(1)
+RBUILD_output_dir=${call RBUILD_output_path_noext,$(2)}_$(1)
 
 #(source)
 RBUILD_intermediate_dir=${call RBUILD_fullpath,$(value INTERMEDIATE)$(SEP)$(dir ${call
RBUILD_strip_prefixes,$(1)})}
+RBUILD_output_dir=${call RBUILD_fullpath,$(value OUTPUT)$(SEP)$(dir ${call
RBUILD_strip_prefixes,$(1)})}
 
 #(source)
 RBUILD_source_name=$(basename $(notdir $(1)))
@@ -150,18 +153,18 @@
 #(module, source, dependencies, cflags, module_dllname, output)
 define RBUILD_WINEBUILD_DEF
 
-$(6): $(2) $$(WINEBUILD_TARGET) | ${call RBUILD_intermediate_dir,$(6)}
+$(6): $(2) $$(winebuild_TARGET) | ${call RBUILD_intermediate_dir,$(6)}
 	$$(ECHO_WINEBLD)
-	$$(Q)$$(WINEBUILD_TARGET) $$(WINEBUILD_FLAGS) -o $$@ --def -E $$< --filename $(5)
${call RBUILD_spec_flags,$(1),$(4)}
+	$$(Q)$$(winebuild_TARGET) $$(WINEBUILD_FLAGS) -o $$@ --def -E $$< --filename $(5)
${call RBUILD_spec_flags,$(1),$(4)}
 
 endef
 
 #(module, source, dependencies, cflags, module_dllname, output)
 define RBUILD_WINEBUILD_STUBS
 
-$(6): $(2) $$(WINEBUILD_TARGET) | ${call RBUILD_intermediate_dir,$(6)}
+$(6): $(2) $$(winebuild_TARGET) | ${call RBUILD_intermediate_dir,$(6)}
 	$$(ECHO_WINEBLD)
-	$$(Q)$$(WINEBUILD_TARGET) $$(WINEBUILD_FLAGS) -o $$@ --pedll $$< --filename $(5)
${call RBUILD_spec_flags,$(1),$(4)}
+	$$(Q)$$(winebuild_TARGET) $$(WINEBUILD_FLAGS) -o $$@ --pedll $$< --filename $(5)
${call RBUILD_spec_flags,$(1),$(4)}
 
 endef
 
@@ -207,15 +210,15 @@
 ${call RBUILD_DEPENDS,$(1),$(2),,${call RBUILD_rc_pp_flags,$(1),$(4)},${call
RBUILD_intermediate_path_unique,$(1),$(2)}.res.d}
 -include ${call RBUILD_intermediate_path_unique,$(1),$(2)}.coff.d
 
-${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) ${call
RBUILD_intermediate_path_unique,$(1),$(2)}.res.d $(3) $$(WRC_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
+${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) ${call
RBUILD_intermediate_path_unique,$(1),$(2)}.res.d $(3) $$(wrc_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
 	$$(ECHO_RC)
-	${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(WRC_TARGET) -o
$$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}}
+	${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(wrc_TARGET) -o
$$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}}
 
 else
 
-${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) $(3) $$(WRC_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
+${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) $(3) $$(wrc_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
 	$$(ECHO_RC)
-	${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(WRC_TARGET) -o
$$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}}
+	${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(wrc_TARGET) -o
$$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}}
 
 endif
 
@@ -233,9 +236,9 @@
 
 $(2): $${$(1)_precondition}
 
-${call RBUILD_intermediate_path_noext,$(2)}.h: $(2) $(3) $$(WIDL_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
-	$$(ECHO_WIDL)
-	$$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H
$$@ $$<
+${call RBUILD_intermediate_path_noext,$(2)}.h: $(2) $(3) $$(widl_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
+	$$(ECHO_WIDL)
+	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H
$$@ $$<
 
 endef
 
@@ -244,9 +247,9 @@
 
 $(2): $${$(1)_precondition}
 
-${call RBUILD_intermediate_path_noext,$(2)}_c.c ${call
RBUILD_intermediate_path_noext,$(2)}_c.h: $(2) $(3) $$(WIDL_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
-	$$(ECHO_WIDL)
-	$$(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)
+${call RBUILD_intermediate_path_noext,$(2)}_c.c ${call
RBUILD_intermediate_path_noext,$(2)}_c.h: $(2) $(3) $$(widl_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
+	$$(ECHO_WIDL)
+	$$(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)
 
 ${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}
 
@@ -257,9 +260,9 @@
 
 $(2): $${$(1)_precondition}
 
-${call RBUILD_intermediate_path_noext,$(2)}_s.c ${call
RBUILD_intermediate_path_noext,$(2)}_s.h: $(2) $(3) $$(WIDL_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
-	$$(ECHO_WIDL)
-	$$(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)
+${call RBUILD_intermediate_path_noext,$(2)}_s.c ${call
RBUILD_intermediate_path_noext,$(2)}_s.h: $(2) $(3) $$(widl_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
+	$$(ECHO_WIDL)
+	$$(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)
 
 ${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}
 
@@ -270,9 +273,9 @@
 
 $(2): $${$(1)_precondition}
 
-${call RBUILD_intermediate_path_noext,$(2)}_p.c ${call
RBUILD_intermediate_path_noext,$(2)}_p.h: $(2) $(3) $$(WIDL_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
-	$$(ECHO_WIDL)
-	$$(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)
+${call RBUILD_intermediate_path_noext,$(2)}_p.c ${call
RBUILD_intermediate_path_noext,$(2)}_p.h: $(2) $(3) $$(widl_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
+	$$(ECHO_WIDL)
+	$$(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)
 
 ${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}
 
@@ -283,9 +286,9 @@
 
 $(2): $${$(1)_precondition}
 
-${call RBUILD_intermediate_path_noext,$(2)}_i.c: $(2) $(3) $$(WIDL_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
-	$$(ECHO_WIDL)
-	$$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -u -U
$$@ $$<
+${call RBUILD_intermediate_path_noext,$(2)}_i.c: $(2) $(3) $$(widl_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
+	$$(ECHO_WIDL)
+	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -u -U
$$@ $$<
 
 ${call RBUILD_CC,$(1),${call
RBUILD_intermediate_path_noext,$(2)}_i.c,,-fno-unit-at-a-time,${call
RBUILD_intermediate_path_noext,$(2)}_i.o}
 
@@ -295,9 +298,9 @@
 #(module, source, dependencies, cflags, bare_dependencies)
 define RBUILD_WIDL_DLLDATA_RULE
 
-$(2): $(3) ${$(1)_precondition} $$(WIDL_TARGET) | ${call RBUILD_intermediate_dir,$(2)}
-	$$(ECHO_WIDL)
-	$$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4)} --dlldata-only --dlldata=$(2)
$(5)
+$(2): $(3) ${$(1)_precondition} $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)}
+	$$(ECHO_WIDL)
+	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4)} --dlldata-only --dlldata=$(2)
$(5)
 
 ${call RBUILD_CC,$(1),$(2),,,${call RBUILD_intermediate_path_noext,$(2)}.o}
 
@@ -308,9 +311,9 @@
 
 $(2): $${$(1)_precondition}
 
-${call RBUILD_intermediate_dir,$(2)}$$(SEP)$(1).tlb: $(2) $(3) $$(WIDL_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
-	$$(ECHO_WIDL)
-	$$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -t -T
$$@ $$<
+${call RBUILD_intermediate_dir,$(2)}$$(SEP)$(1).tlb: $(2) $(3) $$(widl_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
+	$$(ECHO_WIDL)
+	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -t -T
$$@ $$<
 
 endef