From 880e1736545b1010778e989213cce771ca0d648b Mon Sep 17 00:00:00 2001 From: Marc Piulachs Date: Tue, 6 May 2008 14:42:49 +0000 Subject: [PATCH] -Fix unnecessary msi builds, this time for real! msi module was referencing the module 'msi_msiserver_typelib' expecting (OUTPUT)msi_msiserver_typelib.tlb to be build inset of (INTERMEDIATE)msiserver.tlb (the actual generated file). As a result the file was never created and make was trying to recreate it on every build. mystery solved :) (part 1/2) svn path=/trunk/; revision=33322 --- reactos/tools/rbuild/backend/mingw/modulehandler.cpp | 2 +- reactos/tools/rbuild/module.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp index aebc7bb10d6..90693688979 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp @@ -1340,7 +1340,7 @@ Rule widlProxyRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlTlbRule ( "$(source): ${$(module_name)_precondition}\n" - "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp index 6ab6c4940e7..a69288a152a 100644 --- a/reactos/tools/rbuild/module.cpp +++ b/reactos/tools/rbuild/module.cpp @@ -970,10 +970,10 @@ Module::GetTargetDirectoryTree () const case LiveIso: case IsoRegTest: case LiveIsoRegTest: - case EmbeddedTypeLib: case ElfExecutable: case Cabinet: return OutputDirectory; + case EmbeddedTypeLib: case StaticLibrary: case HostStaticLibrary: case ObjectLibrary: -- 2.17.1